From: Joey Hess <joey@kitenet.net>
Date: Mon, 14 May 2012 18:14:39 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20120516~2
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/95a8b8868f1bbf73a9b8a4f36c5e21c2fcd0141b?ds=sidebyside;hp=95a8b8868f1bbf73a9b8a4f36c5e21c2fcd0141b

Merge branch 'master' of ssh://git.ikiwiki.info
---