Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
authorJordan Augé <jordan.auge@lip6.fr>
Wed, 14 Aug 2013 14:45:34 +0000 (16:45 +0200)
committerJordan Augé <jordan.auge@lip6.fr>
Wed, 14 Aug 2013 14:45:34 +0000 (16:45 +0200)

Trivial merge