Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorCiro Scognamiglio <ciro.scognamiglio@cslash.net>
Tue, 6 May 2014 15:40:18 +0000 (17:40 +0200)
committerCiro Scognamiglio <ciro.scognamiglio@cslash.net>
Tue, 6 May 2014 15:40:18 +0000 (17:40 +0200)
commit4078daa9ed64dd8266455484d8e037098c7a9504
tree87841d091e1127683f27a6ef992773de17e65d95
parentbdfaa2b2cff1bf24258ccd7944fd0b1f72576017
parent33e00c00c859446185a959dc3a641f88f4e84892
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab