projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2a56ec6 f0e796d)
Merge commit 'intrigeri/po' into po
authorJoey Hess <joey@kodama.kitenet.net>
Tue, 11 Nov 2008 22:52:51 +0000 (17:52 -0500)
committerJoey Hess <joey@kodama.kitenet.net>
Tue, 11 Nov 2008 22:52:51 +0000 (17:52 -0500)

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