[FFmpeg-cvslog] Merge commit '94d8141c8cd96c176f7d4bdb74a95331ec7db19b'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <clement at stupeflix.com> | Fri Jun 24 10:51:13 2016 +0200| [b1b5ba034f38067949f99b558789d62b2f47e8fe] | committer: Clément Bœsch

Merge commit '94d8141c8cd96c176f7d4bdb74a95331ec7db19b'

* commit '94d8141c8cd96c176f7d4bdb74a95331ec7db19b':
  mov: Append place name instead of overwriting for loci

This commit is a noop, see 1607f774949add9e93bba6f288c9c5bf2c10d880

Merged-by: Clément Bœsch <clement at stupeflix.com>

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