From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 28 Aug 2011 18:07:26 +0000 (+0200)
Subject: Merge branch 'release-4.0.2'
X-Git-Tag: 4.1~175^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=0b2e974893e61a07348eeefbc8089e60386b949e;p=i3%2Fi3

Merge branch 'release-4.0.2'
---

0b2e974893e61a07348eeefbc8089e60386b949e