projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5eb8369 7395546)
Merge remote-tracking branch 'intrigeri/po'
authorJoey Hess <joey@kitenet.net>
Tue, 19 Jul 2011 18:11:36 +0000 (14:11 -0400)
committerJoey Hess <joey@kitenet.net>
Tue, 19 Jul 2011 18:11:36 +0000 (14:11 -0400)

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