[tryton-debian-vcs] tryton-modules-carrier branch upstream-2.6 updated. upstream/2.6.0-1-geb6467f

[Mathias Behrle]

The following commit has been merged in the upstream-2.6 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-carrier.git;a=commitdiff;h=upstream/2.6.0-1-geb6467f

commit eb6467f44de9ffef5f12e452afd55bf789780ad3
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Mar 3 11:47:46 2015 +0100

    Adding upstream version 2.6.1.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/CHANGELOG b/CHANGELOG
index d3ac7c1..0cf52dc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.1 - 2015-02-28
+* Bug fixes (see mercurial logs for details)
+
 Version 2.6.0 - 2012-10-22
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index 7fcb680..61e9a99 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,7 +1,7 @@
-Copyright (C) 2011-2012 Cédric Krier.
+Copyright (C) 2011-2015 Cédric Krier.
 Copyright (C) 2011-2012 Bertrand Chenal.
-Copyright (C) 2011 Nicolas Évrard.
-Copyright (C) 2011-2012 B2CK SPRL.
+Copyright (C) 2011-2015 Nicolas Évrard.
+Copyright (C) 2011-2015 B2CK SPRL.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/PKG-INFO b/PKG-INFO
index f0aa494..dd47e5d 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
 Name: trytond_carrier
-Version: 2.6.0
+Version: 2.6.1
 Summary: Tryton module with carriers
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/tryton.cfg b/tryton.cfg
index 1a74092..a08e45f 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.6.0
+version=2.6.1
 depends:
     ir
     party
diff --git a/trytond_carrier.egg-info/PKG-INFO b/trytond_carrier.egg-info/PKG-INFO
index 4b18a37..dacef79 100644
--- a/trytond_carrier.egg-info/PKG-INFO
+++ b/trytond_carrier.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
 Name: trytond-carrier
-Version: 2.6.0
+Version: 2.6.1
 Summary: Tryton module with carriers
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond_carrier.egg-info/SOURCES.txt b/trytond_carrier.egg-info/SOURCES.txt
index 3b5ceb7..6f1293d 100644
--- a/trytond_carrier.egg-info/SOURCES.txt
+++ b/trytond_carrier.egg-info/SOURCES.txt
@@ -9,6 +9,18 @@ setup.py
 tryton.cfg
 ./__init__.py
 ./carrier.py
+./carrier.xml
+./tryton.cfg
+./locale/bg_BG.po
+./locale/ca_ES.po
+./locale/cs_CZ.po
+./locale/de_DE.po
+./locale/es_AR.po
+./locale/es_CO.po
+./locale/es_ES.po
+./locale/fr_FR.po
+./locale/nl_NL.po
+./locale/ru_RU.po
 ./tests/__init__.py
 ./tests/test_carrier.py
 doc/index.rst
-- 
tryton-modules-carrier