Merge branch 'master' of ssh://git.onelab.eu/git/myslice
authorLoic Baron <loic.baron@lip6.fr>
Fri, 18 Oct 2013 17:27:34 +0000 (19:27 +0200)
committerLoic Baron <loic.baron@lip6.fr>
Fri, 18 Oct 2013 17:27:34 +0000 (19:27 +0200)

Trivial merge