From: Joey Hess Date: Thu, 19 Jul 2012 17:46:45 +0000 (-0400) Subject: Merge remote-tracking branch 'anarcat/inline_diffs' X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9cab856ed70b566292982796187c0c1d71e9d433;p=ikiwiki.git Merge remote-tracking branch 'anarcat/inline_diffs' --- 9cab856ed70b566292982796187c0c1d71e9d433