Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
authorYasin <mohammed-yasin.rahman@lip6.fr>
Wed, 14 Aug 2013 16:25:27 +0000 (18:25 +0200)
committerYasin <mohammed-yasin.rahman@lip6.fr>
Wed, 14 Aug 2013 16:25:27 +0000 (18:25 +0200)

Trivial merge