tree 37a33c33a4fa6100b4fafd3c8cc72c66403818bf
parent 57e206662a40075e36cc2ae457b502784439cf75
parent 0463f7c9aad060fcd56e98d025ce16185279e2bc
author DRC <information@libjpeg-turbo.org> 1454633173 -0600
committer DRC <information@libjpeg-turbo.org> 1454633173 -0600

Merge branch '1.2.x' into 1.3.x