Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorJavier Garcia <javier.garcial@atos.net>
Mon, 30 Nov 2015 11:49:25 +0000 (12:49 +0100)
committerJavier Garcia <javier.garcial@atos.net>
Mon, 30 Nov 2015 11:49:25 +0000 (12:49 +0100)

Trivial merge