projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c005e37 6606c34)
Merge remote-tracking branch 'origin/master'
authorJoey Hess <joey@kitenet.net>
Sat, 30 Apr 2011 20:51:46 +0000 (16:51 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 30 Apr 2011 20:51:46 +0000 (16:51 -0400)

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