Merge branch 'master' of ssh://git.onelab.eu/git/myslice
authorJordan Augé <jordan.auge@lip6.fr>
Sat, 26 Oct 2013 11:20:51 +0000 (13:20 +0200)
committerJordan Augé <jordan.auge@lip6.fr>
Sat, 26 Oct 2013 11:20:51 +0000 (13:20 +0200)

Trivial merge