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

Trivial merge