Merge branch 'master' into senslab2
Sandrine Avakian [Mon, 29 Oct 2012 08:06:46 +0000 (09:06 +0100)]
1  2 
setup.py

diff --cc setup.py
Simple merge