From: Michael Stapelberg Date: Sat, 24 Dec 2011 14:37:13 +0000 (+0100) Subject: Merge branch 'master' into next X-Git-Tag: 4.2~171 X-Git-Url: https://git.sur5r.net/?p=i3%2Fi3;a=commitdiff_plain;h=cea6f7ad96c5e28274dd49c4c394db7f80884bde Merge branch 'master' into next --- cea6f7ad96c5e28274dd49c4c394db7f80884bde