From: Michael Stapelberg <michael@stapelberg.de>
Date: Fri, 12 Aug 2011 21:11:13 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.1~222
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2f116df901f9eddcfe351d09de884dad72b75ee6;p=i3%2Fi3

Merge branch 'master' into next
---

2f116df901f9eddcfe351d09de884dad72b75ee6