From: Joey Hess <joey@kitenet.net>
Date: Sat, 30 Mar 2013 17:44:56 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20130504~42
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/fa5a8aae76c705913467d2e41f50692a9ac1fc26?ds=inline;hp=fa5a8aae76c705913467d2e41f50692a9ac1fc26

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