git://git.onelab.eu / sfa.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4324f13 e39e728)
merged master onto senslab2, manually solved conflicts in setup.py
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 3 Nov 2011 14:59:18 +0000 (15:59 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 3 Nov 2011 14:59:18 +0000 (15:59 +0100)
commit70f4308757e799aeb96545f5e0a22c96dc8633c2
tree84b528eb7fecd81e206b08c3aac07291ba22db85tree | snapshot
parent4324f132f71f09728ef27c921be6c9c37cf50fedcommit | diff
parente39e728991b762ae0b52b52b06655f0c7f1b7421commit | diff
merged master onto senslab2, manually solved conflicts in setup.py
(under control) and rspec.py (now in sfa/rspecs), the latter being the
mainstream version as is
setup.py diff1 | diff2 | blob | history
sfa/trust/auth.py diff1 | diff2 | blob | history
sfa