Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Tue, 6 May 2014 16:19:55 +0000 (18:19 +0200)
committerLoic Baron <loic.baron@lip6.fr>
Tue, 6 May 2014 16:19:55 +0000 (18:19 +0200)
commit47e44bc61b088033691c43be4609e8c4248b2cb8
tree3a1ab9822cd8e4c8055b86b35bc606c06c24d5f4
parent06e175034e7784ab0de43331d16aef51f8eabd24
parente7c6e9d4d40c322684dc0433eb85a7bf85f68f7f
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab