projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ce82641 20ac7c1)
Merge branch 'master' into xapian
authorJoey Hess <joey@kodama.kitenet.net>
Wed, 4 Jun 2008 04:38:43 +0000 (00:38 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Wed, 4 Jun 2008 04:38:43 +0000 (00:38 -0400)

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