projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4058a58 6320bfc)
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Tue, 7 Feb 2012 06:20:09 +0000 (02:20 -0400)
committerJoey Hess <joey@kitenet.net>
Tue, 7 Feb 2012 06:20:09 +0000 (02:20 -0400)

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