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

Merge branch 'fix-ipc-name'
---

3950aa730cd2a9564da46bdcf59f127f6a78b511