From: Michael Stapelberg <michael@stapelberg.de>
Date: Fri, 14 Dec 2012 20:42:21 +0000 (+0100)
Subject: Merge branch 'fix-release'
X-Git-Tag: 4.5~112^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f91e6fb73f45cbe39721fd3dda7d209f3db77edb;p=i3%2Fi3

Merge branch 'fix-release'
---

f91e6fb73f45cbe39721fd3dda7d209f3db77edb