Merge branch 'onelab' of https://github.com/onelab-eu/myslice into onelab
authorYasin Rahman <yasin.upmc@gmail.com>
Thu, 21 May 2015 13:55:39 +0000 (15:55 +0200)
committerYasin Rahman <yasin.upmc@gmail.com>
Thu, 21 May 2015 13:55:39 +0000 (15:55 +0200)

Trivial merge