From: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 11 Jul 2012 17:06:21 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.3~192
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2e6206373ce15c65b25644ff3e63a5314279b4c0;p=i3%2Fi3

Merge branch 'master' into next
---

2e6206373ce15c65b25644ff3e63a5314279b4c0