From: Jonathan Dowland <jon@dowland.me>
Date: Mon, 28 Jul 2014 20:47:40 +0000 (+0100)
Subject: no auto-merge that branch; bad patch
X-Git-Tag: debian/3.20140815~11
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/e70d46051de9c6c567e4f8d2e27ec09deca08e42?hp=e70d46051de9c6c567e4f8d2e27ec09deca08e42

no auto-merge that branch; bad patch
---