From: Michael Stapelberg <michael@stapelberg.de>
Date: Mon, 16 Jul 2012 17:24:41 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.3~191
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1f682eb9c83535fba90d5f1864a921e72bc9f9b0;p=i3%2Fi3

Merge branch 'master' into next
---

1f682eb9c83535fba90d5f1864a921e72bc9f9b0