Merge branch 'master' of ssh://git.onelab.eu/git/myslice
authorLoic Baron <loic.baron@lip6.fr>
Tue, 28 Jan 2014 10:11:25 +0000 (11:11 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Tue, 28 Jan 2014 10:11:25 +0000 (11:11 +0100)

Trivial merge