projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 81eae1a 93cf1db)
Merge branch 'master' into file_pruned_revamp
authorJoey Hess <joey@kitenet.net>
Tue, 20 Apr 2010 21:26:40 +0000 (17:26 -0400)
committerJoey Hess <joey@kitenet.net>
Tue, 20 Apr 2010 21:26:40 +0000 (17:26 -0400)

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