From: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 3 Oct 2012 13:08:31 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.4~87
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=13147978c50b4efa5b4eb0b65d8175aa596a76fe;p=i3%2Fi3

Merge branch 'master' into next
---

13147978c50b4efa5b4eb0b65d8175aa596a76fe