From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 1 Oct 2011 16:44:43 +0000 (+0100)
Subject: Merge branch 'cloexec-errorlog'
X-Git-Tag: 4.1~131^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1f472b096289c2a6f283a9517c5b32aa6fc21744;p=i3%2Fi3

Merge branch 'cloexec-errorlog'
---

1f472b096289c2a6f283a9517c5b32aa6fc21744