projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 67ac2ba e85c15e)
Merge remote branch 'intrigeri/po'
authorJoey Hess <joey@kitenet.net>
Mon, 30 Aug 2010 18:47:57 +0000 (14:47 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 30 Aug 2010 18:47:57 +0000 (14:47 -0400)

Trivial merge
Ikiwiki is a compiler for VCS-based (Git, Subversion, ...) wikis.