Merge branch 'master' of ssh://git.onelab.eu/git/myslice
authorYasin <mohammed-yasin.rahman@lip6.fr>
Tue, 26 Nov 2013 17:07:06 +0000 (18:07 +0100)
committerYasin <mohammed-yasin.rahman@lip6.fr>
Tue, 26 Nov 2013 17:07:06 +0000 (18:07 +0100)

Trivial merge