projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5bdc7f4 9b5a5c1)
Merge remote-tracking branch 'levitte/master'
authorJoey Hess <joey@kitenet.net>
Wed, 30 Mar 2011 18:12:14 +0000 (14:12 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 30 Mar 2011 18:12:14 +0000 (14:12 -0400)

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