Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
authorYasin <mohammed-yasin.rahman@lip6.fr>
Thu, 5 Sep 2013 15:24:12 +0000 (17:24 +0200)
committerYasin <mohammed-yasin.rahman@lip6.fr>
Thu, 5 Sep 2013 15:24:12 +0000 (17:24 +0200)

Trivial merge