projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d96bede eba9b86)
Merge commit 'remotes/jmtd/friendly_markup_names'
authorJoey Hess <joey@gnu.kitenet.net>
Sat, 16 May 2009 14:37:15 +0000 (10:37 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Sat, 16 May 2009 14:37:15 +0000 (10:37 -0400)

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