From: Joey Hess <joey@kitenet.net>
Date: Thu, 17 Mar 2011 21:09:39 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20110321~11
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/4b5e4a9e37b1f28a68bec8c78a8fe3ef4b811f3b?ds=sidebyside;hp=4b5e4a9e37b1f28a68bec8c78a8fe3ef4b811f3b

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