Merge branch 'master' of ssh://git.onelab.eu/git/myslice
authorYasin <mohammed-yasin.rahman@lip6.fr>
Thu, 13 Feb 2014 15:21:45 +0000 (16:21 +0100)
committerYasin <mohammed-yasin.rahman@lip6.fr>
Thu, 13 Feb 2014 15:21:45 +0000 (16:21 +0100)

Trivial merge