From: Michael Stapelberg <michael@stapelberg.de>
Date: Fri, 10 Feb 2012 00:02:20 +0000 (+0000)
Subject: Merge branch 'fix-freebsd-getline'
X-Git-Tag: 4.2~86^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=138197f925392b7629c0dd1dc1ccd274179a9c2d;p=i3%2Fi3

Merge branch 'fix-freebsd-getline'
---

138197f925392b7629c0dd1dc1ccd274179a9c2d