Merge branch 'master' of ssh://git.onelab.eu/git/myslice
authorLoic Baron <loic.baron@lip6.fr>
Fri, 7 Feb 2014 22:22:40 +0000 (23:22 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Fri, 7 Feb 2014 22:22:40 +0000 (23:22 +0100)

Trivial merge