Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into fibre
authorLoic Baron <loic.baron@lip6.fr>
Wed, 23 Jul 2014 16:13:31 +0000 (13:13 -0300)
committerLoic Baron <loic.baron@lip6.fr>
Wed, 23 Jul 2014 16:13:31 +0000 (13:13 -0300)
commit6bb00b8c26df5511beeaa54a33d2b6cce01f5807
tree178d5f7a2304751798b55b0d0802106322a6f680
parentd0e00619b8fe042a1b225fc78a57098ae78b2f4d
parent347240a02ba606177a59bfc98529127e4fbdb894
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into fibre