From: Joey Hess <joey@kitenet.net>
Date: Thu, 19 Jul 2012 17:46:45 +0000 (-0400)
Subject: Merge remote-tracking branch 'anarcat/inline_diffs'
X-Git-Tag: 3.20120725~67
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/9cab856ed70b566292982796187c0c1d71e9d433

Merge remote-tracking branch 'anarcat/inline_diffs'
---

9cab856ed70b566292982796187c0c1d71e9d433