From: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 21 Mar 2012 20:40:55 +0000 (+0100)
Subject: Merge branch 'leavestates'
X-Git-Tag: 4.2~47^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ea97119a763f59abb9cd51bbe84eb5d3e9c729f4;p=i3%2Fi3

Merge branch 'leavestates'
---

ea97119a763f59abb9cd51bbe84eb5d3e9c729f4