From: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 27 Jun 2012 15:49:36 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.3~199
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=072daa94b3f4e369ed9ef20a59a8b18c28170ef9;p=i3%2Fi3

Merge branch 'master' into next
---

072daa94b3f4e369ed9ef20a59a8b18c28170ef9