Merge branch 'master' of ssh://git.onelab.eu/git/myslice
authorJordan Augé <jordan.auge@lip6.fr>
Fri, 18 Oct 2013 17:39:50 +0000 (19:39 +0200)
committerJordan Augé <jordan.auge@lip6.fr>
Fri, 18 Oct 2013 17:39:50 +0000 (19:39 +0200)

Trivial merge