[FFmpeg-cvslog] Merge commit '3cd612d44789948f72b52944474e0870c5c60964'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Dec  1 21:17:55 2013 +0100| [d4268634155d4aaf4c55cffcf6a2d513ec7670ec] | committer: Michael Niedermayer

Merge commit '3cd612d44789948f72b52944474e0870c5c60964'

* commit '3cd612d44789948f72b52944474e0870c5c60964':
  gitignore: Ignore multilibrary example programs

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

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