From: Joey Hess <joey@kitenet.net>
Date: Sun, 23 Feb 2014 18:13:53 +0000 (-0400)
Subject: Merge remote-tracking branch 'intrigeri/fix_diffurl_vs._cgit'
X-Git-Tag: debian/3.20140227~22
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/204dcda88bc595d1ad301a08ae25ebe4bd2afb8a?ds=sidebyside;hp=204dcda88bc595d1ad301a08ae25ebe4bd2afb8a

Merge remote-tracking branch 'intrigeri/fix_diffurl_vs._cgit'
---