Merge branch 'master' of git://git.onelab.eu/sfa into upmc
Jordan Augé [Tue, 6 Nov 2012 21:48:00 +0000 (22:48 +0100)]
1  2 
setup.py

diff --cc setup.py
Simple merge