]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
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