Merge branch 'master' of ssh://git.onelab.eu/git/myslice
authorYasin <mohammed-yasin.rahman@lip6.fr>
Mon, 23 Dec 2013 10:58:38 +0000 (11:58 +0100)
committerYasin <mohammed-yasin.rahman@lip6.fr>
Mon, 23 Dec 2013 10:58:38 +0000 (11:58 +0100)

Trivial merge