Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorJordan Augé <jordan.auge@lip6.fr>
Thu, 10 Jul 2014 13:13:21 +0000 (15:13 +0200)
committerJordan Augé <jordan.auge@lip6.fr>
Thu, 10 Jul 2014 13:13:21 +0000 (15:13 +0200)
commit008571569c52f68031def92eacc412bc5fdc197b
tree8e51809b7b17a5ea5bcb35ff35640b73a2336d6d
parentba21cef1926fc54ca47f75826ab1e4ebc93283c7
parent088740a63dda7aed806be404186674809002ae43
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab