Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
authorJordan Augé <jordan.auge@lip6.fr>
Tue, 13 Aug 2013 13:51:55 +0000 (15:51 +0200)
committerJordan Augé <jordan.auge@lip6.fr>
Tue, 13 Aug 2013 13:51:55 +0000 (15:51 +0200)
commitca6870f59241a93d85a159d48890ac7ec408a1ea
tree61cff395a03f2c4be8eb1c27ff447428f64c8f07
parentc82cd94c927d1f2ccf60a0f3b1a014c1425b1727
parent71188a9ad677af8150780c40ce51936b06e18b9c
Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan