tree f9df7f4049a0fbc67ce6d725d83e3bb0b4d79a1e
parent 785d8c48ea8725691da3c50e7dae8751523d4c30
parent 8edadbf97889fbd80289a72209fdd485ddea3521
author Carlos Martín Nieto <carlosmn@github.com> 1460413097 +0200
committer Carlos Martín Nieto <carlosmn@github.com> 1460413097 +0200

Merge pull request #3739 from ethomson/0.24.1

Backport bug fixes to 0.24