projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5bf7ee5 7179ddc)
Merge remote-tracking branch 'smcv/coverage'
authorJoey Hess <joey@kitenet.net>
Tue, 6 Dec 2011 18:57:23 +0000 (14:57 -0400)
committerJoey Hess <joey@kitenet.net>
Tue, 6 Dec 2011 18:57:23 +0000 (14:57 -0400)

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