Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorJavier García <javier.garcial.external@atos.net>
Mon, 1 Dec 2014 12:09:54 +0000 (13:09 +0100)
committerJavier García <javier.garcial.external@atos.net>
Mon, 1 Dec 2014 12:09:54 +0000 (13:09 +0100)

Trivial merge