projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a380fa0 6512423)
Merge remote branch 'origin/master'
authorJoey Hess <joey@kitenet.net>
Sat, 8 May 2010 23:44:40 +0000 (19:44 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 8 May 2010 23:44:40 +0000 (19:44 -0400)

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