Merge branch 'master' of ssh://git.onelab.eu/git/myslice
authorLoic Baron <loic.baron@lip6.fr>
Sat, 26 Oct 2013 12:48:19 +0000 (14:48 +0200)
committerLoic Baron <loic.baron@lip6.fr>
Sat, 26 Oct 2013 12:48:19 +0000 (14:48 +0200)

Trivial merge