Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Wed, 3 Dec 2014 18:05:51 +0000 (19:05 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Wed, 3 Dec 2014 18:05:51 +0000 (19:05 +0100)
commit55dc9a94de09b1c957d938cfaea8c74e5342fed3
treea30349342775a8c60dc05f20e35364d89d4d079f
parent7c3728554637db272fbb201ed8947808a975ad1e
parent6035cf31001888b4b21c91ace8d758c9756f3fa8
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab