merge from upstream
authorWilliam Deegan <bill@baddogconsulting.com>
Mon, 7 Aug 2017 22:15:47 +0000 (15:15 -0700)
committerWilliam Deegan <bill@baddogconsulting.com>
Mon, 7 Aug 2017 22:15:47 +0000 (15:15 -0700)
commit4936d53c1f92e522f147e846ea0860421098ffea
tree3e06e4cf41242a6650a43ba2a192721185ed25dc
parentfbe80d5c70f497ed6aa4ae662cc1ace55d2cb8c1
parent28e98c747043463bd777161ce98ec1e10ee8e921
merge from upstream
src/CHANGES.txt