Merge branch 'fibre' of ssh://git.onelab.eu/git/myslice into fibre
authorLoic Baron <loic.baron@lip6.fr>
Sun, 27 Jul 2014 14:14:09 +0000 (11:14 -0300)
committerLoic Baron <loic.baron@lip6.fr>
Sun, 27 Jul 2014 14:14:09 +0000 (11:14 -0300)

Trivial merge