From: Joey Hess <joey@kitenet.net>
Date: Sun, 5 Dec 2010 20:38:44 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20101231~85
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/38d7e71c654f27cd2691537742e84b8113f1ad3c?ds=inline;hp=38d7e71c654f27cd2691537742e84b8113f1ad3c

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