projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3b6b0e5 c1f5a1c)
Merge remote-tracking branch 'smcv/ready/trail'
authorJoey Hess <joey@kitenet.net>
Wed, 18 Apr 2012 19:45:37 +0000 (15:45 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 18 Apr 2012 19:45:37 +0000 (15:45 -0400)

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