From: Karel Zak <kzak@redhat.com>
Date: Tue, 1 Apr 2014 09:40:18 +0000 (+0200)
Subject: Merge branch 'travis' of https://github.com/rudimeier/util-linux
X-Git-Tag: v2.25-rc1~394
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8ff90edfc201bd1dabb87b6d7a1d5cc8e9af13e2;p=thirdparty%2Futil-linux.git

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

* 'travis' of https://github.com/rudimeier/util-linux:
  travis-ci: enable more features and update gettext
  tests: getting paraller_jobs more robust
---

8ff90edfc201bd1dabb87b6d7a1d5cc8e9af13e2