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

Trivial merge