Merge branch 'master' of ssh://git.onelab.eu/git/myslice
authorYasin <mohammed-yasin.rahman@lip6.fr>
Mon, 20 Jan 2014 17:02:57 +0000 (18:02 +0100)
committerYasin <mohammed-yasin.rahman@lip6.fr>
Mon, 20 Jan 2014 17:02:57 +0000 (18:02 +0100)

Trivial merge