Merge branch 'onelab' of https://github.com/onelab-eu/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Thu, 10 Dec 2015 16:35:47 +0000 (17:35 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Thu, 10 Dec 2015 16:35:47 +0000 (17:35 +0100)
commit65f3afecca7801020377406f5b3daf9f495a8b94
tree35c8312fb217831a30d64b6a37a526fba779310d
parent1d34262ea4f143f31c95fb4cfc78e945cb00afe3
parent0300e4a519eb44fa1e2b769f1c871471ebfe0620
Merge branch 'onelab' of https://github.com/onelab-eu/myslice into onelab