Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
authorJordan Augé <jordan.auge@lip6.fr>
Mon, 10 Jun 2013 09:51:36 +0000 (11:51 +0200)
committerJordan Augé <jordan.auge@lip6.fr>
Mon, 10 Jun 2013 09:51:36 +0000 (11:51 +0200)

Trivial merge