From: Michael Stapelberg <michael+git@stapelberg.de>
Date: Wed, 25 Feb 2009 00:44:59 +0000 (+0100)
Subject: Merge branch 'master' of zekjur:/git/i3
X-Git-Tag: 3.a~152
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=7333f16aca6e951d85469fbd2fdee81ce92b0ac6;p=i3%2Fi3

Merge branch 'master' of zekjur:/git/i3
---

7333f16aca6e951d85469fbd2fdee81ce92b0ac6