Merge branch 'master' of ssh://git.onelab.eu/git/myslice
authorYasin <mohammed-yasin.rahman@lip6.fr>
Thu, 12 Dec 2013 15:25:29 +0000 (16:25 +0100)
committerYasin <mohammed-yasin.rahman@lip6.fr>
Thu, 12 Dec 2013 15:25:29 +0000 (16:25 +0100)

Trivial merge