[SCM] A Python IDE for scientists branch, master, updated. debian/2.0.12-1-25-g840fa2b

[Frédéric-Emmanuel P?==?UTF-8?Q?ICCA]

The following commit has been merged in the master branch:
commit 3e045b2ea6fdf9c4b6742cd6bdfd1f9108584224
Merge: 1d2304662b5607c6579620dfbf0323b40bc0c377 0dedb19af298f7fe22bb87a9eeb937b295c4c505
Author: Frédéric-Emmanuel PICCA <picca at synchrotron-soleil.fr>
Date:   Thu Nov 3 13:54:20 2011 +0100

    Merge commit 'upstream/2.1.1'


-- 
A Python IDE for scientists