From: Michael Stapelberg <michael@stapelberg.de>
Date: Fri, 26 Aug 2011 10:37:00 +0000 (+0200)
Subject: Merge branch 'fix-duplicate-ws-assign'
X-Git-Tag: 4.0.2~15
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=fdc4413c46576296f731325150a43c928d3923dd;p=i3%2Fi3

Merge branch 'fix-duplicate-ws-assign'
---

fdc4413c46576296f731325150a43c928d3923dd