[FFmpeg-cvslog] Merge commit '35384934d6e27e0334060a23a0c83a3cb5cef198'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Dec  8 21:59:08 2014 +0100| [82f0f0482ed67f32414df7791e26cc473cdcb3bb] | committer: Michael Niedermayer

Merge commit '35384934d6e27e0334060a23a0c83a3cb5cef198'

* commit '35384934d6e27e0334060a23a0c83a3cb5cef198':
  mov: cosmetics: reorder the list of tags

Conflicts:
	libavformat/mov.c

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

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