projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1d9a41e 59277c9)
Merge remote branch 'tove/master'
authorJoey Hess <joey@gnu.kitenet.net>
Sat, 2 Jan 2010 20:11:51 +0000 (15:11 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Sat, 2 Jan 2010 20:11:51 +0000 (15:11 -0500)

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