Merge branch 'master' of ssh://git.onelab.eu/git/sfa
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Mon, 28 Nov 2011 19:44:57 +0000 (20:44 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Mon, 28 Nov 2011 19:44:57 +0000 (20:44 +0100)
commit080e7f90e2c66067aea94c96c4de68fc998e009b
tree3e246f31b72b28bc12b16181ff0058fe7c8dee6e
parent2683c0bfdddafa53495a8d037778cb7d79ad035e
parent5452763eb5e88303eff84ff3dba105eb1f470285
Merge branch 'master' of ssh://git.onelab.eu/git/sfa

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