Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorjavier <javier.garcial.external@atos.net>
Tue, 17 Jun 2014 16:35:13 +0000 (18:35 +0200)
committerjavier <javier.garcial.external@atos.net>
Tue, 17 Jun 2014 16:35:13 +0000 (18:35 +0200)

Trivial merge