From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 25 Jul 2009 20:31:01 +0000 (+0200)
Subject: Merge branch 'next' of zekjur:/git/i3 into next
X-Git-Tag: 3.c~49
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1e095ece847f3f4655c19f08b85b4631837b7c1e;p=i3%2Fi3

Merge branch 'next' of zekjur:/git/i3 into next
---

1e095ece847f3f4655c19f08b85b4631837b7c1e