From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 14 Apr 2013 08:14:51 +0000 (+0200)
Subject: Merge branch 'fix-ipc-fd'
X-Git-Tag: 4.6~46^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=9a91eb83c21bb4c12dd96ddcddcd0da7081d3d78;p=i3%2Fi3

Merge branch 'fix-ipc-fd'
---

9a91eb83c21bb4c12dd96ddcddcd0da7081d3d78