Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
authorJordan Augé <jordan.auge@lip6.fr>
Wed, 3 Jul 2013 08:38:15 +0000 (10:38 +0200)
committerJordan Augé <jordan.auge@lip6.fr>
Wed, 3 Jul 2013 08:38:15 +0000 (10:38 +0200)

Trivial merge