From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 11 Jul 2014 10:05:53 +0000 (+0200)
Subject: Merge branch 'master' into dev
X-Git-Tag: 0.6~4^2~55^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=fd8e5abb8bd03555dc37756ceab018a791949dce;p=timeside.git

Merge branch 'master' into dev

Conflicts:
	README.rst
	setup.py
	timeside/__init__.py
---

fd8e5abb8bd03555dc37756ceab018a791949dce
diff --cc timeside/__init__.py
index 9cf2959,6fc906d..1a1e352
--- a/timeside/__init__.py
+++ b/timeside/__init__.py
@@@ -25,9 -25,9 +25,9 @@@ from __future__ import absolute_impor
  from . import api
  from . import core
  
- 
 +__version__ = '0.5.7'
  
 -__version__ = '0.5.6.3'
+ 
  # Check Availability of external Audio feature extraction librairies
  from .tools import package as ts_package
  _WITH_AUBIO = ts_package.check_aubio()