projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0c68cd5 44b0cea)
Merge remote branch 'smcv/ready/transient'
authorJoey Hess <joey@kitenet.net>
Wed, 9 Feb 2011 17:42:15 +0000 (13:42 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 9 Feb 2011 17:42:15 +0000 (13:42 -0400)

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