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

Trivial merge