Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorCostas Yiotis <coyiotis@netmode.ntua.gr>
Thu, 8 Jan 2015 11:15:06 +0000 (13:15 +0200)
committerCostas Yiotis <coyiotis@netmode.ntua.gr>
Thu, 8 Jan 2015 11:15:06 +0000 (13:15 +0200)

Trivial merge