[tryton-debian-vcs] cached-property branch dto-wheezy updated. debian/1.2.0+ds-3_7wheezy+1-3-g2c84b9e

[Mathias Behrle]

The following commit has been merged in the dto-wheezy branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/cached-property.git;a=commitdiff;h=debian/1.2.0+ds-3_7wheezy+1-3-g2c84b9e

commit 2c84b9eb96d7beedf8afefabd8c3481d93a5d86c
Merge: f09ab0b 64da3ee
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Fri Jan 8 13:35:08 2016 +0100

    Merge branch 'debian' into dto-wheezy
    
    Conflicts:
    	debian/changelog

diff --cc debian/changelog
index 527082a,0b19a93..5b2360b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
+ cached-property (1.3.0-1) unstable; urgency=medium
+ 
+   * Merging upstream version 1.3.0.
+ 
+  -- Mathias Behrle <mathiasb at m9s.biz>  Fri, 08 Jan 2016 13:24:54 +0100
+ 
 +cached-property (1.2.0+ds-3~7wheezy+1) unstable; urgency=medium
 +
 +  * Disabling tests for wheezy, freezegun not available.
 +
 + -- Mathias Behrle <mathiasb at m9s.biz>  Fri, 13 Nov 2015 16:20:22 +0100
 +
  cached-property (1.2.0+ds-2) unstable; urgency=medium
  
    * Adapting section naming in gbp.conf to current git-buildpackage.
-- 
cached-property