Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorCostas Yiotis <coyiotis@gmail.com>
Fri, 28 Nov 2014 17:23:59 +0000 (19:23 +0200)
committerCostas Yiotis <coyiotis@gmail.com>
Fri, 28 Nov 2014 17:23:59 +0000 (19:23 +0200)

Trivial merge