From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 2 Oct 2011 18:21:27 +0000 (+0100)
Subject: Merge branch 'msg' into next
X-Git-Tag: 4.1~126
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=29fb09ae74e49744f29793fdae5221f8cad39361;p=i3%2Fi3

Merge branch 'msg' into next
---

29fb09ae74e49744f29793fdae5221f8cad39361