From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 10 Jun 2012 16:23:26 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.3~207
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=cf91dc676adf1303379587696803d93802ade5c6;p=i3%2Fi3

Merge branch 'master' into next
---

cf91dc676adf1303379587696803d93802ade5c6