Merge branch 'upgrade-bootstrap' into new-style
authorRaniere Silva <raniere@ime.unicamp.br>
Sat, 25 Apr 2015 11:40:21 +0000 (08:40 -0300)
committerRaniere Silva <raniere@ime.unicamp.br>
Sat, 25 Apr 2015 11:40:21 +0000 (08:40 -0300)

Trivial merge