From: Joey Hess <joey@kitenet.net>
Date: Tue, 21 Feb 2012 17:05:36 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20120203~143
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/b1968dbb24bbf9da41fce0cdaa64aa4495412c7c?ds=sidebyside;hp=b1968dbb24bbf9da41fce0cdaa64aa4495412c7c

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