tree 9ad92eab6dc5f19237b9a28b3823be67bda83fb6
parent 0ea4019bdca0f3b19e4949c4c6cf83a6115dbfd2
parent 08db2e2c167404c5ed9be0fc1c995e41bad479bb
author Carlos Martín Nieto <carlosmn@github.com> 1499527246 +0200
committer Carlos Martín Nieto <carlosmn@github.com> 1499527312 +0200

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

This is a no-op merge to reconcile the differences in the Commit receivers.