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

Trivial merge