tree 1ea9d2395c545bf7a38251f860052961d6c5a641
parent 04dd34c14ed21d36e80447dd988fa1ce4ebe5ac5
parent c454c595dc83028770727fdb7eac7842875465ac
author DRC <information@libjpeg-turbo.org> 1454633227 -0600
committer DRC <information@libjpeg-turbo.org> 1454633302 -0600

Merge branch '1.3.x' into 1.4.x