projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8c57116 3e8b7a6)
Merge branch 'next'
authorJoey Hess <joey@gnu.kitenet.net>
Wed, 31 Dec 2008 18:33:10 +0000 (13:33 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Wed, 31 Dec 2008 18:33:10 +0000 (13:33 -0500)

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