projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eb13d46 be0b4f6)
Merge branch 'master' of git://git.madduck.net/code/ikiwiki
authorJoey Hess <joey@kodama.kitenet.net>
Sat, 1 Mar 2008 03:47:26 +0000 (22:47 -0500)
committerJoey Hess <joey@kodama.kitenet.net>
Sat, 1 Mar 2008 03:47:26 +0000 (22:47 -0500)

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