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

Trivial merge