[tryton-debian-vcs] tryton-client branch debian-jessie-3.0 updated. debian/3.0.15-1-3-g21d6121

[Mathias Behrle]

The following commit has been merged in the debian-jessie-3.0 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-client.git;a=commitdiff;h=debian/3.0.15-1-3-g21d6121

commit 21d6121ff51547231e447a839a38545c0a4dc96b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Mar 15 20:28:34 2016 +0100

    Releasing debian version 3.0.16-1.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/debian/changelog b/debian/changelog
index f6de67b..45ab899 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-client (3.0.16-1) unstable; urgency=medium
+
+  * Updating signing-key.asc with the actual upstream maintainer keys.
+  * Merging upstream version 3.0.16.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Tue, 15 Mar 2016 20:28:34 +0100
+
 tryton-client (3.0.15-1) unstable; urgency=medium
 
   * Merging upstream version 3.0.15.
commit d1e8e2d0c5769089779d42ac1c71f3bed52e50a5
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Mar 15 20:28:33 2016 +0100

    Merging upstream version 3.0.16.

diff --git a/CHANGELOG b/CHANGELOG
index cfbec66..c633586 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.0.16 - 2016-03-14
+* Bug fixes (see mercurial logs for details)
+
 Version 3.0.15 - 2016-02-06
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 5c15e54..765ea83 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: tryton
-Version: 3.0.15
+Version: 3.0.16
 Summary: Tryton client
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/setup.nsi b/setup.nsi
index 6bfd7f7..7efdcd4 100644
--- a/setup.nsi
+++ b/setup.nsi
@@ -55,10 +55,10 @@ Var STARTMENU_FOLDER
 
 ;Languages
 
+!insertmacro MUI_LANGUAGE "English" ; First is the default
+!include "english.nsh"
 !insertmacro MUI_LANGUAGE "Catalan"
 !include "catalan.nsh"
-!insertmacro MUI_LANGUAGE "English"
-!include "english.nsh"
 !insertmacro MUI_LANGUAGE "French"
 !include "french.nsh"
 !insertmacro MUI_LANGUAGE "German"
diff --git a/tryton.egg-info/PKG-INFO b/tryton.egg-info/PKG-INFO
index 5c15e54..765ea83 100644
--- a/tryton.egg-info/PKG-INFO
+++ b/tryton.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: tryton
-Version: 3.0.15
+Version: 3.0.16
 Summary: Tryton client
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/tryton/version.py b/tryton/version.py
index 7a7a11f..0cc74c9 100644
--- a/tryton/version.py
+++ b/tryton/version.py
@@ -1,6 +1,6 @@
 #This file is part of Tryton.  The COPYRIGHT file at the top level of
 #this repository contains the full copyright notices and license terms.
 PACKAGE = "tryton"
-VERSION = "3.0.15"
+VERSION = "3.0.16"
 LICENSE = "GPL-3"
 WEBSITE = "http://www.tryton.org/"
-- 
tryton-client