From: Joey Hess Date: Wed, 30 Mar 2011 18:12:14 +0000 (-0400) Subject: Merge remote-tracking branch 'levitte/master' X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=02d30b1552886540be94d5066e16c06f02e348d3 Merge remote-tracking branch 'levitte/master' --- 02d30b1552886540be94d5066e16c06f02e348d3