[commons-imaging] 05/05: Merge branch 'IMAGING-220'

[kinow]

This is an automated email from the ASF dual-hosted git repository.

kinow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-imaging.git

commit 0291af48b5c08ffd2d290cd528edd6687124b2c9
Merge: 9519e44 289ca5b
Author: Bruno P. Kinoshita <ki...@apache.org>
AuthorDate: Tue Jan 8 20:07:30 2019 +1300

    Merge branch 'IMAGING-220'

 src/changes/changes.xml                            |   3 ++
 .../imaging/formats/jpeg/decoder/JpegDecoder.java  |   2 +-
 .../formats/jpeg/decoder/JpegDecoderTest.java      |  47 +++++++++++++++++++++
 ...imeout-48eb4251935b4ca8b26d1859ea525c1b42ae0c78 | Bin 0 -> 932 bytes
 4 files changed, 51 insertions(+), 1 deletion(-)