tree 941f760c4a30200a0bfd0ce54cfd00e425aef8be
parent 55594814c9009f9d645aea39a9f917cf82666228
parent dc8b154f4f1b346fb6b8dee99fcfa6e4ca2d2d24
author Carlos Martín Nieto <carlosmn@github.com> 1455797408 +0100
committer Carlos Martín Nieto <carlosmn@github.com> 1455797408 +0100

Merge pull request #282 from ianlancetaylor/master

handles, merge, odb: changes for Go 1.6 pointer passing rules