From: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 24 Aug 2011 14:58:43 +0000 (+0200)
Subject: Merge branch 'fix-assign-screen'
X-Git-Tag: 4.0.2~30
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=b31948aecb50b923f77eacf9de33a2c9856bf1ff;p=i3%2Fi3

Merge branch 'fix-assign-screen'
---

b31948aecb50b923f77eacf9de33a2c9856bf1ff