Merge commit '2bcd8f22f2fae253d87b11a5c9f8805d79253180' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 2 Dec 2014 13:14:34 +0000 (14:14 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 2 Dec 2014 13:14:39 +0000 (14:14 +0100)
commitafcd152b973e40763aa800dd1376925ce6b146b9
tree0496bfb76f9032934b6d4a0ba0f3eba58e2f3cb1
parentdad7beaceb652864cd16747db4109e7b9b2b4ea1
parent2bcd8f22f2fae253d87b11a5c9f8805d79253180
Merge commit '2bcd8f22f2fae253d87b11a5c9f8805d79253180' into release/2.2

* commit '2bcd8f22f2fae253d87b11a5c9f8805d79253180':
  Treat all '*.pnm' files as non-text file

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