Merge remote-tracking branch 'mfischer/libjpeg' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 16 Mar 2015 17:00:40 +0000 (18:00 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 16 Mar 2015 17:00:40 +0000 (18:00 +0100)

Trivial merge