tree 348bcdaee3069834ec26d316c62bfcaabfcc5777
parent 32eaeeac9e1941a664e2d418a42abbc202734cf0
parent 0dd9a2c1fd6c232021f66750d2b2846d5a646faf
author DRC <information@libjpeg-turbo.org> 1519692220 -0600
committer DRC <information@libjpeg-turbo.org> 1519692220 -0600

Merge branch 'master' into dev

Closes #214