From: Axel Wagner <mail@merovius.de>
Date: Wed, 25 Aug 2010 22:03:41 +0000 (+0200)
Subject: Merge branch 'hide' into next
X-Git-Tag: 4.0.1~7^2~72
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=0963a0e5ac237ef22451c1b0291cb2aa637ca1d1;p=i3%2Fi3

Merge branch 'hide' into next
---

0963a0e5ac237ef22451c1b0291cb2aa637ca1d1