[FFmpeg-cvslog] Merge commit '08c2d8f0aa679c2f060721d1d0d4f33d2ae32368'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jul  1 03:18:30 2015 +0200| [68939f7682de3e87251c6e08470d5779804ddd6d] | committer: Michael Niedermayer

Merge commit '08c2d8f0aa679c2f060721d1d0d4f33d2ae32368'

* commit '08c2d8f0aa679c2f060721d1d0d4f33d2ae32368':
  Go2Meeting decoder

Conflicts:
	Changelog
	libavcodec/g2meet.c
	libavcodec/version.h

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

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