Merge branch 'master' of ssh://git.onelab.eu/git/myslice
authorJordan Augé <jordan.auge@lip6.fr>
Tue, 3 Dec 2013 16:27:42 +0000 (17:27 +0100)
committerJordan Augé <jordan.auge@lip6.fr>
Tue, 3 Dec 2013 16:27:42 +0000 (17:27 +0100)

Trivial merge