From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 22 Dec 2012 13:08:14 +0000 (+0100)
Subject: Merge branch 'fix-scratch-confreq'
X-Git-Tag: 4.5~100^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=bf2b25a91546cffffd2f8bdedda74c7e1ea6794a;p=i3%2Fi3

Merge branch 'fix-scratch-confreq'
---

bf2b25a91546cffffd2f8bdedda74c7e1ea6794a