From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 2 Oct 2011 15:13:23 +0000 (+0100)
Subject: Merge branch 'get-socketpath' into next
X-Git-Tag: 4.1~129
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1f7cb178f9ad07e41c9fe29278497f2f84a53692;p=i3%2Fi3

Merge branch 'get-socketpath' into next
---

1f7cb178f9ad07e41c9fe29278497f2f84a53692