From: Joey Hess <joey@kitenet.net>
Date: Mon, 13 Feb 2012 15:43:39 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/021521ffc82497b2c8148bb948e6b682f85d2bce?ds=sidebyside

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

021521ffc82497b2c8148bb948e6b682f85d2bce