projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f34dc3d 82e6902)
Merge branch 'master' into next
authorJoey Hess <joey@gnu.kitenet.net>
Mon, 29 Dec 2008 20:08:32 +0000 (15:08 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Mon, 29 Dec 2008 20:08:32 +0000 (15:08 -0500)

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