From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 10 Jun 2012 16:31:54 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.3~205
X-Git-Url: https://git.sur5r.net/?p=i3%2Fi3;a=commitdiff_plain;h=f96e998abb2f27de93cc4404b017060d4bdec6d0

Merge branch 'master' into next
---

f96e998abb2f27de93cc4404b017060d4bdec6d0