From: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 15 Feb 2012 22:05:28 +0000 (+0000)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.2~70
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=5edacf49435023ab5a876d3425693ea530872918;p=i3%2Fi3

Merge branch 'master' into next
---

5edacf49435023ab5a876d3425693ea530872918