From: Axel Wagner <mail@merovius.de>
Date: Thu, 23 Dec 2010 15:51:36 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.0.1~7^2~36
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=73bbc7529f1a437f1034b8e42e6818a9c39d5bf5;p=i3%2Fi3

Merge branch 'master' into next
---

73bbc7529f1a437f1034b8e42e6818a9c39d5bf5