From: Joey Hess <joey@kitenet.net>
Date: Mon, 4 Mar 2013 17:19:31 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/d72e5fd58c121582b2a2a1feca39596c29a1feb0?hp=-c

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

d72e5fd58c121582b2a2a1feca39596c29a1feb0