Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
authorYasin <mohammed-yasin.rahman@lip6.fr>
Tue, 13 Aug 2013 09:43:07 +0000 (11:43 +0200)
committerYasin <mohammed-yasin.rahman@lip6.fr>
Tue, 13 Aug 2013 09:43:07 +0000 (11:43 +0200)

Trivial merge