Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
authorJordan Augé <jordan.auge@lip6.fr>
Fri, 24 May 2013 08:19:40 +0000 (10:19 +0200)
committerJordan Augé <jordan.auge@lip6.fr>
Fri, 24 May 2013 08:19:40 +0000 (10:19 +0200)

Trivial merge