From: Michael Stapelberg <michael@stapelberg.de>
Date: Mon, 29 Aug 2011 13:17:53 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.1~173
X-Git-Url: https://git.sur5r.net/?p=i3%2Fi3;a=commitdiff_plain;h=1a34d250bb5551d641e9fb762ec323506034bfce

Merge branch 'master' into next
---

1a34d250bb5551d641e9fb762ec323506034bfce