Merge branch 'fibre' of ssh://git.onelab.eu/git/myslice into fibre
authorLoic Baron <loic.baron@lip6.fr>
Thu, 24 Jul 2014 09:40:45 +0000 (06:40 -0300)
committerLoic Baron <loic.baron@lip6.fr>
Thu, 24 Jul 2014 09:40:45 +0000 (06:40 -0300)

Trivial merge