From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Mon, 19 Feb 2018 23:31:55 +0000 (+0100)
Subject: Merge branch 'master' into dev
X-Git-Tag: 1.7.0~2^2~4^2~16
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=e41a877c6dbd7353656929c94f81b2d95d02d5d0;p=telemeta.git

Merge branch 'master' into dev
---

e41a877c6dbd7353656929c94f81b2d95d02d5d0
diff --cc telemeta/__init__.py
index 8c5c4b16,2002e455..613ad0f5
--- a/telemeta/__init__.py
+++ b/telemeta/__init__.py
@@@ -15,12 -15,12 +15,12 @@@ U{http://telemeta.org
  """
  
  __docformat__ = 'epytext en'
 -__version__ = '1.6.5'
 +__version__ = '1.7.0'
  __url__ = 'http://telemeta.org'
- __copyright__ = '(C) 2006-2017 Parisson SARL'
+ __copyright__ = '(C) 2006-2018 Parisson SARL'
  __license__ = 'AGPLv3'
  __license_long__ = """
- Copyright (C) Parisson SARL (2006-2017)
+ Copyright (C) Parisson SARL (2006-2018)
  
  This file is part of Telemeta.