From: Karel Zak <kzak@redhat.com>
Date: Thu, 1 Jun 2017 10:30:14 +0000 (+0200)
Subject: Merge branch 'travis-test' of https://github.com/rudimeier/util-linux
X-Git-Tag: v2.30~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8ea1651c387d658ed5255b46d3813f8d73dd393b;p=thirdparty%2Futil-linux.git

Merge branch 'travis-test' of https://github.com/rudimeier/util-linux

* 'travis-test' of https://github.com/rudimeier/util-linux:
  tests: check for timeout command
  Revert "tests: use stdbuf when stderr and stdout is randomly ordered"
---

8ea1651c387d658ed5255b46d3813f8d73dd393b