Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Thu, 27 Feb 2014 14:10:26 +0000 (15:10 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Thu, 27 Feb 2014 14:10:26 +0000 (15:10 +0100)
commitcc3925accfc3e466072e77420cb3682d67a67894
tree637acfe0dca3f10691c31a5a29850db8af7074f4
parentd92190b72663209866f435de37c51ed1890b1358
parent9393a6bbc3529c5cb31a9ac2f0077667b2198272
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab