From: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 30 Jan 2013 12:30:59 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.5~31
X-Git-Url: https://git.sur5r.net/?p=i3%2Fi3;a=commitdiff_plain;h=fcdfab4d280cf469f339ce7168082658b9b76c8c;hp=-c

Merge branch 'master' into next
---

fcdfab4d280cf469f339ce7168082658b9b76c8c