From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 16 May 2009 14:37:15 +0000 (-0400)
Subject: Merge commit 'remotes/jmtd/friendly_markup_names'
X-Git-Tag: 3.13~89
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/251fe8dae6e0bdf5a3d3ad4fc413b2163fecbb75?hp=-c

Merge commit 'remotes/jmtd/friendly_markup_names'
---

251fe8dae6e0bdf5a3d3ad4fc413b2163fecbb75