Merge branch 'master' of ssh://git.onelab.eu/git/myslice
authorLoic Baron <loic.baron@lip6.fr>
Mon, 28 Oct 2013 10:53:00 +0000 (11:53 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Mon, 28 Oct 2013 10:53:00 +0000 (11:53 +0100)

Trivial merge