From: Michael Stapelberg <michael@stapelberg.de>
Date: Thu, 24 Nov 2011 23:50:08 +0000 (+0000)
Subject: Merge branch 'fix-norandr'
X-Git-Tag: 4.1.1~31
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c36042dfb1c3556dafd6dc7f0bfdb2bfe26104b7;p=i3%2Fi3

Merge branch 'fix-norandr'
---

c36042dfb1c3556dafd6dc7f0bfdb2bfe26104b7