From: Michael Stapelberg <michael@stapelberg.de>
Date: Fri, 14 Dec 2012 20:50:15 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.5~109
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=73ec3dd3b07e8de90e7c0a5ccba9a5c3d2908efa;p=i3%2Fi3

Merge branch 'master' into next
---

73ec3dd3b07e8de90e7c0a5ccba9a5c3d2908efa