From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 16 Sep 2012 15:59:43 +0000 (+0200)
Subject: Merge branch 'fix-fullscreen-scratch'
X-Git-Tag: 4.3~9^2
X-Git-Url: https://git.sur5r.net/?p=i3%2Fi3;a=commitdiff_plain;h=4df409bae642cbf51582ef6746b388b85c0b3f8d

Merge branch 'fix-fullscreen-scratch'
---

4df409bae642cbf51582ef6746b388b85c0b3f8d