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

Trivial merge