Merge branch 'master' of ssh://git.onelab.eu/git/myslice
authorYasin <mohammed-yasin.rahman@lip6.fr>
Fri, 15 Nov 2013 09:39:25 +0000 (10:39 +0100)
committerYasin <mohammed-yasin.rahman@lip6.fr>
Fri, 15 Nov 2013 09:39:25 +0000 (10:39 +0100)

Trivial merge