Merge Dev into parameters_with_traits

author Thomas Fillon <thomas@parisson.com>

Thu, 17 Jul 2014 11:55:09 +0000 (13:55 +0200)

committer Thomas Fillon <thomas@parisson.com>

Thu, 17 Jul 2014 11:55:09 +0000 (13:55 +0200)
author Thomas Fillon <thomas@parisson.com>
Thu, 17 Jul 2014 11:55:09 +0000 (13:55 +0200)
committer Thomas Fillon <thomas@parisson.com>
Thu, 17 Jul 2014 11:55:09 +0000 (13:55 +0200)
diff --cc setup.py
Simple merge
diff --cc timeside/analyzer/limsi_sad.py
Simple merge
author	Thomas Fillon <thomas@parisson.com>
	Thu, 17 Jul 2014 11:55:09 +0000 (13:55 +0200)
committer	Thomas Fillon <thomas@parisson.com>
	Thu, 17 Jul 2014 11:55:09 +0000 (13:55 +0200)
		1	2
setup.py	patch \|	diff1 \|	diff2 \|	blob \| history
timeside/analyzer/limsi_sad.py	patch \|	diff1 \|	diff2 \|	blob \| history