From: Michael Stapelberg <michael@stapelberg.de>
Date: Mon, 12 Aug 2013 07:13:55 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.7~72
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3216cc79deb9bfc2258220e7b18f994c7d261474;p=i3%2Fi3

Merge branch 'master' into next
---

3216cc79deb9bfc2258220e7b18f994c7d261474