From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 16 Mar 2013 23:59:52 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.6~77
X-Git-Url: https://git.sur5r.net/?p=i3%2Fi3;a=commitdiff_plain;h=1510579c867500c9cea01ed605b71152643510ee

Merge branch 'master' into next
---

1510579c867500c9cea01ed605b71152643510ee