From: Joey Hess <joey@kitenet.net>
Date: Mon, 4 Mar 2013 22:32:40 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20130504~72
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/a417262d58c1b8240357e6e0a203e1f32c39205d?ds=sidebyside;hp=a417262d58c1b8240357e6e0a203e1f32c39205d

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