Merge commit '0f257e29c5520b215e573e7e3abde8e5a4743309'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 30 Nov 2014 17:17:51 +0000 (18:17 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 30 Nov 2014 17:18:20 +0000 (18:18 +0100)
commit79440651149c89fba9ef5563c9b8a4b3a59acdf5
treeebd4c4a4a029d1e922933cc99e039211e5fc62be
parent4c592c39087a15e2b37aa46956775b7fa869fa57
parent0f257e29c5520b215e573e7e3abde8e5a4743309
Merge commit '0f257e29c5520b215e573e7e3abde8e5a4743309'

* commit '0f257e29c5520b215e573e7e3abde8e5a4743309':
  Treat all '*.pnm' files as non-text file

Merged-by: Michael Niedermayer <michaelni@gmx.at>