projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: aba2d83 dd862b4)
Merge commit 'smcv/atom'
authorJoey Hess <joey@gnu.kitenet.net>
Tue, 3 Feb 2009 20:04:36 +0000 (15:04 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Tue, 3 Feb 2009 20:04:36 +0000 (15:04 -0500)

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