From: Joey Hess <joey@kitenet.net>
Date: Mon, 5 Dec 2011 19:17:53 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=2c7a8bd6848fd90de9c88c51765325ca51453713;hp=-c

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

2c7a8bd6848fd90de9c88c51765325ca51453713