From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 20 Aug 2011 15:48:49 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.1~213
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2cd8231fce33bd312ec818724d9225ff8b20255a;p=i3%2Fi3

Merge branch 'master' into next
---

2cd8231fce33bd312ec818724d9225ff8b20255a