From: Joey Hess <joey@kitenet.net>
Date: Sun, 23 Jun 2013 18:04:42 +0000 (-0400)
Subject: Merge branch 'restrict-comment-formats' of git://rtime.felk.cvut.cz/sojka/ikiwiki
X-Git-Tag: 3.20130710~32
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/5038f36cba2c7db223708d06a65f99b08c25b733

Merge branch 'restrict-comment-formats' of git://rtime.felk.cvut.cz/sojka/ikiwiki
---

5038f36cba2c7db223708d06a65f99b08c25b733