From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 17 Dec 2011 22:34:55 +0000 (+0000)
Subject: Merge branch 'fix-bindsym'
X-Git-Tag: 4.1.1~11
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=386477b789660014efed5f6647716e4e52147201;p=i3%2Fi3

Merge branch 'fix-bindsym'
---

386477b789660014efed5f6647716e4e52147201