From: Joey Hess Date: Wed, 6 Oct 2010 18:36:13 +0000 (-0400) Subject: Merge branch 'master' into revert X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=9366c5efd38a4c1c7f5d4506982b9bda20eb9ada Merge branch 'master' into revert --- 9366c5efd38a4c1c7f5d4506982b9bda20eb9ada