From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 10 Nov 2012 08:01:24 +0000 (+0100)
Subject: Merge branch 'fix-baf-after-scratchpad'
X-Git-Tag: 4.4~37^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=17674de5a6fddfdf6cb5e9f3b9b6485d59ad8940;p=i3%2Fi3

Merge branch 'fix-baf-after-scratchpad'
---

17674de5a6fddfdf6cb5e9f3b9b6485d59ad8940