From: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 24 Aug 2011 14:58:47 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.1~206
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c527497a4be64ff8d91d7978211db9358f9cef11;p=i3%2Fi3

Merge branch 'master' into next
---

c527497a4be64ff8d91d7978211db9358f9cef11