From: Joey Hess <joey@kitenet.net>
Date: Mon, 4 Mar 2013 22:32:40 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/a417262d58c1b8240357e6e0a203e1f32c39205d?ds=sidebyside

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

a417262d58c1b8240357e6e0a203e1f32c39205d