From: Joey Hess <joey@kitenet.net>
Date: Mon, 21 Nov 2011 15:16:30 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20111107~58
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/bbce8b15ccfccbc3bfb0a8e231649fa3870e706b

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

bbce8b15ccfccbc3bfb0a8e231649fa3870e706b