projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: df864f0 f2d559d)
Merge git://git.samba.org/jelmer/ikiwiki
authorJoey Hess <joey@kodama.kitenet.net>
Wed, 30 Jan 2008 00:28:51 +0000 (19:28 -0500)
committerJoey Hess <joey@kodama.kitenet.net>
Wed, 30 Jan 2008 00:28:51 +0000 (19:28 -0500)

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