From: Karel Zak <kzak@redhat.com>
Date: Wed, 4 Jun 2014 12:16:22 +0000 (+0200)
Subject: Merge branch 'misc-build-sys' of https://github.com/rudimeier/util-linux
X-Git-Tag: v2.25-rc1~50
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ee7f60034bd99dd201d30ed47fb54fcb0328af1c;p=thirdparty%2Futil-linux.git

Merge branch 'misc-build-sys' of https://github.com/rudimeier/util-linux

* 'misc-build-sys' of https://github.com/rudimeier/util-linux:
  tests: fix python tests for dist and out-of-tree builds
  build-sys: fix update-potfiles script
  build-sys: restore make distcheck's configure flags
  build-sys: use automake's PYTHON primary for __init__.py
  tests: ignore deprecated last
  tests: remove deprecated mount tests

Conflicts:
	Makefile.am
---

ee7f60034bd99dd201d30ed47fb54fcb0328af1c