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)
commitbb6f0f209e23365ac5b0ae1c9f853d47e93ee58d
treedee6f05aa0a0a108f1e29e89f60fad2a29e45977
parenta3b57313edf793386d3fb7604afeda5f6ad187c3
parent0d08b98818d9c2aa0f132a2b98daac2f0b16cb68
Merge branch 'upgrade-bootstrap' into new-style