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

Trivial merge