projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0badce2 2d60e55)
Merge remote branch 'smcv/ready/no-tags'
authorJoey Hess <joey@kitenet.net>
Sun, 9 May 2010 16:56:07 +0000 (12:56 -0400)
committerJoey Hess <joey@kitenet.net>
Sun, 9 May 2010 16:56:07 +0000 (12:56 -0400)

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