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

Merge branch 'master' into next
---

d852c174686c82665ec803d9017e380db23aa7da