From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 29 Jan 2012 18:02:48 +0000 (+0000)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.2~99
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=36464c7a546cb8541d55157bf7dd89aea8645a94;p=i3%2Fi3

Merge branch 'master' into next
---

36464c7a546cb8541d55157bf7dd89aea8645a94