From: Axel Wagner <mail@merovius.de>
Date: Sun, 26 Dec 2010 14:27:32 +0000 (+0100)
Subject: Merge branch 'master' into tree
X-Git-Tag: 4.0.1~7^2~3^2~51
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3c85c514d427b7be4404084d5e867ac2bd93784d;p=i3%2Fi3

Merge branch 'master' into tree
---

3c85c514d427b7be4404084d5e867ac2bd93784d