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

Trivial merge