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)
commit2f2b5105c47db6b8b9ec42e2bbfa28d967fe1178
treed674a22efc419c5c60e66208ba6d89d760679ae5
parent1342aaf8dd0a0c55d960817e88cac5d379029054
parentd5781436789241a7891dbdd80d4b256c76d9aedf
Merge remote-tracking branch 'mfischer/libjpeg' into next