Merge remote-tracking branch 'origin/master'
authorKeith Packard <keithp@keithp.com>
Thu, 23 Feb 2017 06:58:32 +0000 (22:58 -0800)
committerKeith Packard <keithp@keithp.com>
Thu, 23 Feb 2017 06:58:32 +0000 (22:58 -0800)
commitcaf09cb2c3c5ddea895386477cda2675c1e97ae9
tree0a6fc91983d2fce12d92ed394733eaeb1f84b829
parent3c2beba26f994444b7fa5981886ea880d3fc4a56
parent4a0bb9471bc54a961121e7ad4da13030a25a3339
Merge remote-tracking branch 'origin/master'

Discard change to hide refdes