Merge branch 'master' of ssh://git.onelab.eu/git/myslice
authorJordan Augé <jordan.auge@lip6.fr>
Thu, 19 Sep 2013 12:40:59 +0000 (14:40 +0200)
committerJordan Augé <jordan.auge@lip6.fr>
Thu, 19 Sep 2013 12:40:59 +0000 (14:40 +0200)

Trivial merge