Merge branch 'master' of ssh://git.onelab.eu/git/myslice
authorLoic Baron <loic.baron@lip6.fr>
Mon, 20 Jan 2014 15:42:11 +0000 (16:42 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Mon, 20 Jan 2014 15:42:11 +0000 (16:42 +0100)

Trivial merge