Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Wed, 14 May 2014 13:54:28 +0000 (15:54 +0200)
committerLoic Baron <loic.baron@lip6.fr>
Wed, 14 May 2014 13:54:28 +0000 (15:54 +0200)
commit3be2cc2bab8bbde89a4dc72afcc0346171b1b763
treed8d34d0eb9a6a63c8c4e5b292222322346035ed1
parent41bb7dd5ec2f6ead60d87b40946b47058dd12eee
parent7854df75afedb76acc75692956a5c7b65da64ee0
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab