git://git.onelab.eu / sfa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d243349 aaa7504)
Merge branch 'master' of ssh://bakers@git.planet-lab.org/git/sfa
authorsmbaker <smbaker@fc8clean.lan>
Mon, 10 Oct 2011 23:05:24 +0000 (16:05 -0700)
committersmbaker <smbaker@fc8clean.lan>
Mon, 10 Oct 2011 23:05:24 +0000 (16:05 -0700)
1  2 
sfa/client/sfi.py patch | diff1 | diff2 | blob | history

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