From: Joey Hess <joey@kitenet.net>
Date: Thu, 27 Sep 2012 23:03:20 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20121016~36
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/1a362c7912156eb3d34663361b4659a22bfc2cf6?ds=sidebyside;hp=1a362c7912156eb3d34663361b4659a22bfc2cf6

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