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

Trivial merge