projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0550c78 64031e3)
Merge remote-tracking branch 'origin/master'
authorJoey Hess <joey@kitenet.net>
Sun, 6 Nov 2011 19:57:24 +0000 (15:57 -0400)
committerJoey Hess <joey@kitenet.net>
Sun, 6 Nov 2011 19:57:24 +0000 (15:57 -0400)

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