[FFmpeg-cvslog] Merge commit '9510d7689e236f6a4748795604fba427c130d0ad'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Oct 29 21:45:18 2013 +0100| [a8fe8d4fe9868b11bf6417e4b9b6b3e50d637b69] | committer: Michael Niedermayer

Merge commit '9510d7689e236f6a4748795604fba427c130d0ad'

* commit '9510d7689e236f6a4748795604fba427c130d0ad':
  fate.sh: Allow non-fast-forwards when updating sources

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a8fe8d4fe9868b11bf6417e4b9b6b3e50d637b69
---