Merge tag '1.31' into devel

tagging package pristine-tar version 1.31

Conflicts:
	debian/changelog

Change-Id: Ia4f7bdad3f0b64559b3f507fe8b7c79a1f3f37af

diff --cc debian/changelog
index 6b6c6a78b1d03be9fa3555f1a2e26ebf3a994f9d,798993e07c76664e4e1b87c1f69e1051d7ec14d6..385b2e23d27e33530cf54bbad9a68706a7076a16
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,10 +1,20 @@@
+ pristine-tar (1.31) unstable; urgency=medium
+ 
+   * Build on Hurd without needing PATH_MAX defined. Closes: #738670
+     Thanks, Svante Signell
+ 
+  -- Joey Hess <joeyh@debian.org>  Wed, 23 Apr 2014 14:01:03 -0400
+ 
 +pristine-tar (1.30-tizen20140227) unstable; urgency=low
 +
 +  * Version bump to 1.30.
 +  * packaging: change dependency to tar.
 +    Require tar < 1.27 for now - the Debian PRISTINE_TAR_COMPAT patch for tar
 +    to cope with tar file format changes is not generally available in other
 +    distributions than Debian.
 +
 + -- Markus Lehtonen <markus.lehtonen@linux.intel.com>  Thu, 27 Feb 2014 10:41:32 +0200
 +
  pristine-tar (1.30) unstable; urgency=low
  
    * Set GIT_WORK_TREE when committing to make it work when inside

diff --cc debian/control
Simple merge