a
a
Merge branch 'master' of github.com:xingxux/image_compression

Conflicts:
	entropy_libjpeg/jpeg-9/config.log
	entropy_libjpeg/jpeg-9/config.status
	entropy_libjpeg/jpeg-9/libtool
Merge branch 'master' of github.com:xingxux/image_compression
Merge branch 'master' of github.com:xingxux/image_compression
Merge branch 'master' of github.com:xingxux/image_compression
Merge branch 'master' of github.com:xingxux/image_compression
a