From: Michael Stapelberg <michael@stapelberg.de>
Date: Fri, 14 Sep 2012 11:18:00 +0000 (+0200)
Subject: Merge branch 'fix-scratchpad-focus'
X-Git-Tag: 4.3~10^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=0929f68a100078965ae41f90f130cb209b3102cc;p=i3%2Fi3

Merge branch 'fix-scratchpad-focus'
---

0929f68a100078965ae41f90f130cb209b3102cc