projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c2656f0 cce3042)
Merge branch 'master' into templatemove
authorJoey Hess <joey@kitenet.net>
Sat, 24 Apr 2010 20:46:30 +0000 (16:46 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 24 Apr 2010 20:46:30 +0000 (16:46 -0400)

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