Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorCostas Yiotis <coyiotis@gmail.com>
Mon, 24 Nov 2014 10:36:01 +0000 (12:36 +0200)
committerCostas Yiotis <coyiotis@gmail.com>
Mon, 24 Nov 2014 10:36:01 +0000 (12:36 +0200)

Trivial merge