tree 74dd7792fd6cefdb98b21b53049170e8870a0c71
parent e09c5db296004fbe3f74490e84dcd62c3c5ddb1b
parent 8db9ce6cc143f7123d383490909e8c9354d67883
author Joe Tsai <joetsai@digital-static.net> 1525114361 -0700
committer GitHub <noreply@github.com> 1525114361 -0700
gpgsig -----BEGIN PGP SIGNATURE-----
 
 wsBcBAABCAAQBQJa52X5CRBK7hj4Ov3rIwAAdHIIAJ3x7KGjUPCcxvaMmInaivuU
 TalTGrTt+ap8NdOjiHQFuUUQ6mIl4y/ZLuqmkSYD2dBUolw5EKqf756UfVyDylKk
 McI781QckAxw1vZgEDoBUo/w0v3he+iUNehCjGocZriF/oEyt507NMxGK0QOV8tP
 qpWwnXHgUWVDkAuldk7UgDVQ5/Uwx+aZcgYqOLwYD8wWkmafHx686mZtHGks9TjI
 9cPi7aZ5olpqNEeh0B9UHx7/28yynUXPSpB1KMrYopw5ZKTXDMRLFkdLoJ/d3eJa
 MK5pl+QfxuJ5o2gHj9JGGejtHXGstqdNEPdab8xhwFiQkz/M/ZzdL17JKHa0GsE=
 =XZAl
 -----END PGP SIGNATURE-----
 

Merge pull request #591 from golang/master-merge

Merge remote-tracking branch 'origin/dev' into master