Merge branch 'master' of ssh://git.onelab.eu/git/sface
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Mon, 23 May 2011 14:26:17 +0000 (16:26 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Mon, 23 May 2011 14:26:17 +0000 (16:26 +0200)
commit1790ec67340d64652164e895f1c7620580b40019
tree414e9cdfc2260402ba72dc4c5fccb355d1147aa0
parent6d695f75f8ada305d7d8c9f5e519ead6032ff097
parentcd0d3ba43d176aac4a076f8498c6efcb5111dc12
Merge branch 'master' of ssh://git.onelab.eu/git/sface