From: Michael Stapelberg <michael@stapelberg.de>
Date: Mon, 15 Apr 2013 19:01:27 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.6~44
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=06730f44e61ea845b56f86e9aa55a8eb1c66064a;p=i3%2Fi3

Merge branch 'master' into next
---

06730f44e61ea845b56f86e9aa55a8eb1c66064a