git://git.onelab.eu / sfa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3db8adc 951442d)
Merge branch 'master' into senslab2
authorSandrine Avakian <sandrine.avakian@inria.fr>
Thu, 26 Apr 2012 08:52:40 +0000 (10:52 +0200)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Thu, 26 Apr 2012 08:52:40 +0000 (10:52 +0200)
1  2 
sfa/client/sfi.py patch | diff1 | diff2 | blob | history
sfa/util/xrn.py patch | diff1 | diff2 | blob | history

diff --cc sfa/client/sfi.py
Simple merge
diff --cc sfa/util/xrn.py
Simple merge
sfa