[openarena-data] 01/01: Merge branch 'master' into openarena-085-data

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch openarena-085-data
in repository openarena-data.

commit a57e4ac17870a7ae0617873937fac6455b94a346
Merge: 6d5c0fb 7dc8885
Author: Simon McVittie <smcv at debian.org>
Date:   Sun Sep 25 17:39:04 2016 +0100

    Merge branch 'master' into openarena-085-data

 debian/changelog | 9 +++++++++
 debian/rules     | 1 +
 2 files changed, 10 insertions(+)

diff --cc debian/changelog
index 2937024,adb3b70..c973fb7
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,6 -1,12 +1,15 @@@
 -openarena-data (0.8.5split-9) unstable; urgency=medium
++openarena-085-data (0.8.5split-9) unstable; urgency=medium
+ 
 -  * Normalize mtime of vm directory in PK3 archive to SOURCE_DATE_EPOCH
 -    for reproducible builds of openarena-data, openarena-085-data,
 -    openarena-088-data
++  * Merge from openarena-data/0.8.5split-9:
++    - Normalize mtime of vm directory in PK3 archive to SOURCE_DATE_EPOCH
++      for reproducible builds of openarena-data, openarena-085-data,
++      openarena-088-data
+ 
 - -- Simon McVittie <smcv at debian.org>  Sun, 25 Sep 2016 17:38:41 +0100
++ -- Simon McVittie <smcv at debian.org>  Sun, 25 Sep 2016 17:39:35 +0100
+ 
 -openarena-data (0.8.5split-8) unstable; urgency=medium
 +openarena-085-data (0.8.5split-8) unstable; urgency=medium
 +
 +  * Merge from openarena-data/0.8.5split-8:
  
    [ Alexandre Detiste ]
    * Normalize permissions of PK3 archive contents to 0644/0755 to

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/openarena-data.git