Merge branch 'master' of ssh://git.onelab.eu/git/sface
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Fri, 17 Sep 2010 15:26:09 +0000 (17:26 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Fri, 17 Sep 2010 15:26:09 +0000 (17:26 +0200)
commit8a7370e1d65ed72a93c745e8916bb0fa8f8881e9
tree2288e95c607ef32f246730bc135ea829b1960fa2
parentae4178aa86de12d5ca165da42460f500ba4efba7
parent8ec23b298e338e6005b7a4d12480cc06a38ec03e
Merge branch 'master' of ssh://git.onelab.eu/git/sface