Merge branch 'master' of ssh://git.onelab.eu/git/myslice
authorJordan Augé <jordan.auge@lip6.fr>
Fri, 6 Dec 2013 15:28:59 +0000 (16:28 +0100)
committerJordan Augé <jordan.auge@lip6.fr>
Fri, 6 Dec 2013 15:28:59 +0000 (16:28 +0100)

Trivial merge