[wesnoth] 01/01: Merge branch 'master' into jessie-backports

[Vincent Cheng]

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

vcheng pushed a commit to branch jessie-backports
in repository wesnoth.

commit a6133f7a9b2a7cc998073bdc8e43ca38ffb4c8e8
Merge: 5fa8916 a3713bf
Author: Vincent Cheng <vcheng at debian.org>
Date:   Thu Dec 31 00:23:40 2015 -0800

    Merge branch 'master' into jessie-backports

 .gitignore                              |  2 ++
 debian/changelog                        | 10 ++++++++++
 debian/wesnoth-1.12-server.tmpfile      |  2 +-
 debian/wesnoth-BRANCH-server.tmpfile.in |  2 +-
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index cf1c9e7,4a5b9fd..3208807
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,13 +1,19 @@@
+ wesnoth-1.12 (1:1.12.5-1) unstable; urgency=medium
+ 
+   [ Vincent Cheng ]
+   * Fix permission error when creating socket with wesnothd. (Closes: #791660)
+ 
+   [ Rhonda D'Vine ]
+   * New upstream stable release.
+ 
+  -- Vincent Cheng <vcheng at debian.org>  Mon, 28 Dec 2015 13:49:43 -0800
+ 
 +wesnoth-1.12 (1:1.12.4-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Vincent Cheng <vcheng at debian.org>  Tue, 07 Jul 2015 02:10:34 -0700
 +
  wesnoth-1.12 (1:1.12.4-1) unstable; urgency=medium
  
    * New upstream stable release.

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