[FFmpeg-cvslog] Merge commit '40020e171a3549a2c0b65ce6f2649aec868872f2'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat May 18 11:17:52 2013 +0200| [97200d89b9fccef1b72ea0e0e1d8eff7a5e05f43] | committer: Michael Niedermayer

Merge commit '40020e171a3549a2c0b65ce6f2649aec868872f2'

* commit '40020e171a3549a2c0b65ce6f2649aec868872f2':
  doxy: add a section about versioning.

Conflicts:
	libavutil/avutil.h

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

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