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

Trivial merge