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

Trivial merge