From: Michael Stapelberg <michael@stapelberg.de>
Date: Fri, 27 Jan 2012 19:26:42 +0000 (+0000)
Subject: Merge branch 'release-4.1.2'
X-Git-Tag: 4.2~111^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=49cf36cd5973fd33c759768e150da52240c06b44;p=i3%2Fi3

Merge branch 'release-4.1.2'
---

49cf36cd5973fd33c759768e150da52240c06b44