From: Michael Stapelberg <michael+git@stapelberg.de>
Date: Sun, 22 Feb 2009 23:18:48 +0000 (+0100)
Subject: Merge branch 'master' of zekjur:/git/i3
X-Git-Tag: 3.a~170
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4ba6ddb41cec60809caf8ad25b0f48f19e7fea28;p=i3%2Fi3

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

4ba6ddb41cec60809caf8ad25b0f48f19e7fea28