From: Michael Stapelberg <stapelberg@users.noreply.github.com>
Date: Wed, 26 Oct 2016 17:48:56 +0000 (+0200)
Subject: Merge pull request #2518 from stapelberg/travis
X-Git-Tag: 4.13~12
X-Git-Url: https://git.sur5r.net/?p=i3%2Fi3;a=commitdiff_plain;h=664d11c77c9c968b2ea668d1041934a0d1de3ac0

Merge pull request #2518 from stapelberg/travis

More travis fixes
---

664d11c77c9c968b2ea668d1041934a0d1de3ac0