Merge commit '0ce1a7598e84abe6fb3684d0d5b0872d36f001d7'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 28 Aug 2013 10:57:05 +0000 (12:57 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 28 Aug 2013 10:57:09 +0000 (12:57 +0200)
commitbc6e535db13222d7de97b774639e6a7d42afd91c
treea09b0f0989d6a868b3900dd2c739fac0e068c843
parent983ed20c1cc6b3358cf536fe1c778533a8c50c27
parent0ce1a7598e84abe6fb3684d0d5b0872d36f001d7
Merge commit '0ce1a7598e84abe6fb3684d0d5b0872d36f001d7'

* commit '0ce1a7598e84abe6fb3684d0d5b0872d36f001d7':
  vf_interlace: fix file permissions

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