Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 1 Mar 2014 14:06:32 +0000 (15:06 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 1 Mar 2014 14:08:05 +0000 (15:08 +0100)
* qatar/master:
  qt-faststart: Add a note about the -movflags +faststart feature

Conflicts:
tools/qt-faststart.c

See: 2574d62d0dd34df762aa2d80c7d6381918a80ed1
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge