From: Michael Stapelberg <michael@stapelberg.de>
Date: Fri, 14 Sep 2012 11:18:04 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.3~10
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=794783defbb7073f5ca4676e9b088308baac5540;p=i3%2Fi3

Merge branch 'master' into next
---

794783defbb7073f5ca4676e9b088308baac5540