From: Costas Yiotis <coyiotis@netmode.ntua.gr>
Date: Thu, 8 Jan 2015 11:15:06 +0000 (+0200)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.3~122^2~5^2~3
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=ea22db0e99695ec26e1481558af65e0a541572da

Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
---

ea22db0e99695ec26e1481558af65e0a541572da