[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Apr  7 04:16:17 2014 +0200| [13aa5757643eb05da27077acdde4a876a6e50d75] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  xtea: Add Doxy @file and group

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

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