projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 49c6790 276ab9a)
Merge remote-tracking branch 'smcv/trail'
authorJoey Hess <joey@kitenet.net>
Thu, 5 Apr 2012 16:22:41 +0000 (12:22 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 5 Apr 2012 16:22:41 +0000 (12:22 -0400)

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