From: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 19 Dec 2012 20:40:53 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.5~105
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=bb3ae9f960847c3801e5d52129d08f249ca8f3f6;p=i3%2Fi3

Merge branch 'master' into next
---

bb3ae9f960847c3801e5d52129d08f249ca8f3f6