| commit | b6f760f425f93c511139649ea43ae674f1cbddb1 | [log] [tgz] |
|---|---|---|
| author | Nicolas Noble <nicolasnoble@users.noreply.github.com> | Mon Jul 11 23:31:32 2016 -0700 |
| committer | GitHub <noreply@github.com> | Mon Jul 11 23:31:32 2016 -0700 |
| tree | 8e09e444fc1edf35423040858d356186b29c757d | |
| parent | 2b98c8838d2035296b9cb016fc9af2bb8a987d90 [diff] | |
| parent | 91833144355ac6b06bba4dc49ee2d2f82efc1324 [diff] |
Merge pull request #7329 from nicolasnoble/upmerge-master Upmerge from 0.15 to master.