Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorCiro Scognamiglio <ciro.scognamiglio@cslash.net>
Fri, 4 Jul 2014 15:11:32 +0000 (17:11 +0200)
committerCiro Scognamiglio <ciro.scognamiglio@cslash.net>
Fri, 4 Jul 2014 15:11:32 +0000 (17:11 +0200)
commit67b07f0775cf6e4d3e2b8813f6792af3b2e6e4d1
treec24d46d921911daa4c19760a65efad932658363b
parente9f4c27f8db6850b0a583f5be192e102ab44bc13
parent6a9a23c9050d9b78efd63bdc17a51949da435246
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab