Merge branch 'master' of git.onelab.eu:/git/sfa
authorBarış Metin <Talip-Baris.Metin@sophia.inria.fr>
Mon, 4 Oct 2010 16:19:35 +0000 (18:19 +0200)
committerBarış Metin <Talip-Baris.Metin@sophia.inria.fr>
Mon, 4 Oct 2010 16:19:35 +0000 (18:19 +0200)
commita84a9f560f623d7500622e275426ae0e12332a03
tree8b048f1069d9de600e577176dff8e3e2740f5678
parentce9588d74a160c88bcea8445febce805f4d8c635
parentca37ec53ab3e64ad0c87e69e05697fd7f0302539
Merge branch 'master' of git.onelab.eu:/git/sfa

Conflicts:
sfa/client/sfi.py
sfa/client/sfi.py