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

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