From: Joey Hess <joey@kitenet.net>
Date: Wed, 30 Nov 2011 20:49:18 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20111107~1
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/f55931dd769c732cc50d4ca7df9293a28574bee0

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

f55931dd769c732cc50d4ca7df9293a28574bee0