Merge branch 'master' of ssh://git.onelab.eu/git/myslice
authorLoic Baron <loic.baron@lip6.fr>
Mon, 20 Jan 2014 17:30:24 +0000 (18:30 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Mon, 20 Jan 2014 17:30:24 +0000 (18:30 +0100)
commit2870580fcaad4c3f1a2b9fa75499dcd4f7297449
tree1eff8f7a8f31935ed8d279875e96bb300fbd2ba8
parent75749c7c77f3df53e859f3eabba9e6db3c0764e1
parentb2567e7154bbc91e4927559ccd89c8896a106889
Merge branch 'master' of ssh://git.onelab.eu/git/myslice