projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bd40b1e 6e962a2)
Merge commit '6e962a2d747bd8a8bbbdfc5b8eaeb689100c0b1c'
authorJoey Hess <joey@kitenet.net>
Wed, 2 Jan 2013 19:29:50 +0000 (15:29 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 2 Jan 2013 19:29:50 +0000 (15:29 -0400)

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