Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Thu, 5 Sep 2013 15:45:12 +0000 (17:45 +0200)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Thu, 5 Sep 2013 15:45:12 +0000 (17:45 +0200)
commitcbde85d915cd1cb92ce141a6bf7f5b589703047e
treee6a50c9ce0ee02c71001eb866675bde5cc577e84
parentb4ab1b3fb9c0820ea410167f7b8bf05ab2ccae24
parent4b6b013580973461964d6a2f3ed66636ac5e7dbc
Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan