Merge branch 'master' of ssh://git.onelab.eu/git/myslice
authorYasin <mohammed-yasin.rahman@lip6.fr>
Tue, 17 Sep 2013 13:21:52 +0000 (15:21 +0200)
committerYasin <mohammed-yasin.rahman@lip6.fr>
Tue, 17 Sep 2013 13:21:52 +0000 (15:21 +0200)

Trivial merge