From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 28 Aug 2011 15:44:57 +0000 (+0200)
Subject: Merge branch 'fix-urls'
X-Git-Tag: 4.0.2~4
X-Git-Url: https://git.sur5r.net/?p=i3%2Fi3;a=commitdiff_plain;h=1d83e776f11925f553fe6501d04a60aaa7448787

Merge branch 'fix-urls'
---

1d83e776f11925f553fe6501d04a60aaa7448787