Merge branch 'master' of ssh://git.onelab.eu/git/myslice
authorYasin <mohammed-yasin.rahman@lip6.fr>
Thu, 26 Sep 2013 10:25:56 +0000 (12:25 +0200)
committerYasin <mohammed-yasin.rahman@lip6.fr>
Thu, 26 Sep 2013 10:25:56 +0000 (12:25 +0200)

Trivial merge