projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 20a20f2 c7bc11f)
Merge remote-tracking branch 'smcv/trail-test'
authorJoey Hess <joey@kitenet.net>
Mon, 19 Mar 2012 15:19:41 +0000 (11:19 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 19 Mar 2012 15:19:41 +0000 (11:19 -0400)

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