From: Joey Hess <joey@kitenet.net>
Date: Fri, 5 Aug 2011 14:13:46 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20110905~90
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/68140a8df21cc90b8291da923beac6b52274abe2?ds=sidebyside;hp=68140a8df21cc90b8291da923beac6b52274abe2

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