From: Michael Stapelberg <michael@stapelberg.de>
Date: Thu, 20 Sep 2012 08:56:58 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.4~155
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=485b49bbe306563c7bd45a544ad06a7916fe40da;p=i3%2Fi3

Merge branch 'master' into next
---

485b49bbe306563c7bd45a544ad06a7916fe40da