projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 20052f8 0bc76be)
Merge branch 'master' into autotag
authorJoey Hess <joey@kitenet.net>
Thu, 22 Apr 2010 00:32:30 +0000 (20:32 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 22 Apr 2010 00:32:30 +0000 (20:32 -0400)

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