From: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 25 Apr 2012 21:30:18 +0000 (+0200)
Subject: Merge branch 'release-4.2'
X-Git-Tag: 4.3~237
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=fda8b3d44d4e82dad93c5de4e71f91a4b6356ea1;p=i3%2Fi3

Merge branch 'release-4.2'
---

fda8b3d44d4e82dad93c5de4e71f91a4b6356ea1