From: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 22 Aug 2012 14:02:02 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.3~67
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4622cde7b785b522b29d66c7d9bdcc9aa1eeb452;p=i3%2Fi3

Merge branch 'master' into next
---

4622cde7b785b522b29d66c7d9bdcc9aa1eeb452