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

Trivial merge