From: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 23 Nov 2011 21:54:52 +0000 (+0000)
Subject: Merge branch 'hacking-howto' into next
X-Git-Tag: 4.2~224
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=52d000f45e1e8665b29bde866a4a483fd21df353;p=i3%2Fi3

Merge branch 'hacking-howto' into next
---

52d000f45e1e8665b29bde866a4a483fd21df353