Merge branch 'fibre' of ssh://git.onelab.eu/git/myslice into fibre
authorRezende & Pedro & Carlos & Raphael <rezende@land.ufrj.br>
Thu, 7 Aug 2014 19:20:00 +0000 (16:20 -0300)
committerRezende & Pedro & Carlos & Raphael <rezende@land.ufrj.br>
Thu, 7 Aug 2014 19:20:00 +0000 (16:20 -0300)

Trivial merge