Merge branch 'master' of ssh://git.onelab.eu/git/myslice
authorLoic Baron <loic.baron@lip6.fr>
Wed, 4 Dec 2013 11:55:02 +0000 (12:55 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Wed, 4 Dec 2013 11:55:02 +0000 (12:55 +0100)

Trivial merge