From: Michael Stapelberg <michael@stapelberg.de>
Date: Fri, 25 Jan 2013 14:48:38 +0000 (+0100)
Subject: Merge branch 'fix-scratchpad-reconf'
X-Git-Tag: 4.5~42^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d426f1570bd99315486c0b0634e04393aa65e6ed;p=i3%2Fi3

Merge branch 'fix-scratchpad-reconf'
---

d426f1570bd99315486c0b0634e04393aa65e6ed