From: Michael Stapelberg <michael@stapelberg.de>
Date: Fri, 11 Nov 2011 22:49:15 +0000 (+0000)
Subject: Merge branch 'release-4.1' into next
X-Git-Tag: 4.1.1~36^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=0c2fe85c3670c5c14cf5d7c6e3d7245e4eed22fb;p=i3%2Fi3

Merge branch 'release-4.1' into next
---

0c2fe85c3670c5c14cf5d7c6e3d7245e4eed22fb