projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 64d4a4a b2a2246)
Merge remote branch 'intrigeri/po'
authorJoey Hess <joey@kitenet.net>
Sat, 25 Dec 2010 16:35:25 +0000 (12:35 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 25 Dec 2010 16:35:25 +0000 (12:35 -0400)

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