From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 28 Jun 2014 11:05:40 +0000 (+0200)
Subject: Merge branch 'revert-warp'
X-Git-Tag: 4.9~82^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=b5f3679a667ad9a641353c9895500709b9a4359f;p=i3%2Fi3

Merge branch 'revert-warp'
---

b5f3679a667ad9a641353c9895500709b9a4359f