From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 31 Jan 2015 21:42:54 +0000 (+0100)
Subject: Merge branch 'fix-ws-con'
X-Git-Tag: 4.9~15^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a1aa8786266a791c9dd69437f1e848d6c0956950;p=i3%2Fi3

Merge branch 'fix-ws-con'
---

a1aa8786266a791c9dd69437f1e848d6c0956950