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

Merge branch 'master' into next
---

75c11cb894b6965a9e466e503be263ed180a32c6