Merge branch 'master' of ssh://git.onelab.eu/git/myslice
authorYasin <mohammed-yasin.rahman@lip6.fr>
Tue, 10 Dec 2013 17:28:08 +0000 (18:28 +0100)
committerYasin <mohammed-yasin.rahman@lip6.fr>
Tue, 10 Dec 2013 17:28:08 +0000 (18:28 +0100)

Trivial merge