tree 09fad5cf79bc9d91600db1707948f6ce1372ff89
parent 51cc89fa7b44e8b67596b571956b93230f83f3f7
parent 5426a4cb166ccea3ec0eef6fbef55ee83e442c19
author DRC <information@libjpeg-turbo.org> 1504326003 +0000
committer DRC <information@libjpeg-turbo.org> 1504326040 +0000

Merge branch 'master' into dev