From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 28 Aug 2011 15:02:19 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.1~180
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f0a0236b7b4ac57bc9155edf438e90ea44715778;p=i3%2Fi3

Merge branch 'master' into next
---

f0a0236b7b4ac57bc9155edf438e90ea44715778