Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
authorYasin <mohammed-yasin.rahman@lip6.fr>
Mon, 19 Aug 2013 17:06:08 +0000 (19:06 +0200)
committerYasin <mohammed-yasin.rahman@lip6.fr>
Mon, 19 Aug 2013 17:06:08 +0000 (19:06 +0200)

Trivial merge