From: Karel Zak <kzak@redhat.com>
Date: Wed, 5 Mar 2014 08:25:43 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/rudimeier/util-linux
X-Git-Tag: v2.25-rc1~556
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=013efbfad4648095e09ef1944c89277acf839671;p=thirdparty%2Futil-linux.git

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

* 'master' of https://github.com/rudimeier/util-linux:
  travis-ci: import travis yaml controller
---

013efbfad4648095e09ef1944c89277acf839671