From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 31 Jul 2011 19:56:02 +0000 (+0200)
Subject: Merge branch 'tree' into next
X-Git-Tag: 4.0~14
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2728c0246794df9eae0a12d77f32d7bd0031df6f;p=i3%2Fi3

Merge branch 'tree' into next
---

2728c0246794df9eae0a12d77f32d7bd0031df6f