projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 812a5a1 7029f98)
Merge remote-tracking branch 'smcv/ready/trail'
authorJoey Hess <joey@kitenet.net>
Wed, 2 Jan 2013 19:31:10 +0000 (15:31 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 2 Jan 2013 19:31:10 +0000 (15:31 -0400)

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