Merge tag '1.31' into devel
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>
Tue, 20 May 2014 09:20:06 +0000 (12:20 +0300)
committerMarkus Lehtonen <markus.lehtonen@linux.intel.com>
Tue, 20 May 2014 09:20:06 +0000 (12:20 +0300)
commit91bf3951728d557bdf3a68e25c830eafff28795e
tree041d3026f122dae522ef25da49af5167e4b935bb
parent0509ea12b6114da2f07b813577a93b6437954ed0
parent0e9bed20556284ad35f21f2adf26dc31ee8f6be9
Merge tag '1.31' into devel

tagging package pristine-tar version 1.31

Conflicts:
debian/changelog

Change-Id: Ia4f7bdad3f0b64559b3f507fe8b7c79a1f3f37af
debian/changelog
debian/control