From: Michael Stapelberg <michael@stapelberg.de>
Date: Tue, 12 Mar 2013 13:05:41 +0000 (+0100)
Subject: Merge branch 'release-4.5' into next
X-Git-Tag: 4.5.1~5^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=de9c31611db28f28169b1d05170f1eed714471b6;p=i3%2Fi3

Merge branch 'release-4.5' into next
---

de9c31611db28f28169b1d05170f1eed714471b6