From: Michael Stapelberg <michael@stapelberg.de>
Date: Tue, 9 Aug 2011 07:47:10 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.1~228
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f8d834c62d6b5ce89e13824bc29f6c9416edc223;p=i3%2Fi3

Merge branch 'master' into next
---

f8d834c62d6b5ce89e13824bc29f6c9416edc223