From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 24 Dec 2011 15:28:48 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.2~170
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=20b8b1a22a9946e7736a5a3760ba8fdf648293d5;p=i3%2Fi3

Merge branch 'master' into next
---

20b8b1a22a9946e7736a5a3760ba8fdf648293d5