Merge branch 'master' of ssh://git.onelab.eu/git/myslice
authorYasin <mohammed-yasin.rahman@lip6.fr>
Tue, 28 Jan 2014 10:04:20 +0000 (11:04 +0100)
committerYasin <mohammed-yasin.rahman@lip6.fr>
Tue, 28 Jan 2014 10:04:20 +0000 (11:04 +0100)

Trivial merge