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

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

* 'master' of https://github.com/rudimeier/util-linux:
  tests: try hard to create swaplabel's test image
  build-sys: libmount/python/__init__.py is always a dist file
  tests: return error if failures file not usable
  tests: write tests/failures to build- instead of srcdir
---

b5ce1c5642172168572f0df1db7ed23e7261b0db