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

Trivial merge