Merge branch 'master' of ssh://git.onelab.eu/git/sfa
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Fri, 16 Dec 2011 16:39:32 +0000 (17:39 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Fri, 16 Dec 2011 16:39:32 +0000 (17:39 +0100)
commite67041c37b86490c71d2f0b4d4b9c27b283141de
treeb65d0b936480a45de4c2032af27e13f96a739fba
parent1ba7f6f2887ea828d8aa515f45993429df2b8b7a
parent9e0733e84aa51928e190fb15cf93f6bde8dc84e1
Merge branch 'master' of ssh://git.onelab.eu/git/sfa
Conflicts:
sfa/client/sfi.py
sfa/client/sfi.py