From: Michael Stapelberg <michael@stapelberg.de>
Date: Thu, 24 Jan 2013 13:45:14 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.5~49
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a5c9b0dedbe13a0099ec7fa466a548cc987e6613;p=i3%2Fi3

Merge branch 'master' into next
---

a5c9b0dedbe13a0099ec7fa466a548cc987e6613