Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorJordan Augé <jordan.auge@lip6.fr>
Tue, 8 Jul 2014 12:04:14 +0000 (14:04 +0200)
committerJordan Augé <jordan.auge@lip6.fr>
Tue, 8 Jul 2014 12:04:14 +0000 (14:04 +0200)
commit2f06be434c87ce050612b2fa77d9835f9436aa07
treee8a840581618d89def7d7ecd8f384d7a37ec3095
parentf3a072fb375f469d9e9e0704570e727c453eb9a3
parentdab507094d9c7067c4fb5dc030213fd35b04e515
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab