[FFmpeg-cvslog] Merge commit '4a2ef39442bf7f0150db07a1fbfcf8286e4d44a3'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jul 26 10:43:12 2013 +0200| [af7949fdea2f3115c82143178a22a39afe7bbde1] | committer: Michael Niedermayer

Merge commit '4a2ef39442bf7f0150db07a1fbfcf8286e4d44a3'

* commit '4a2ef39442bf7f0150db07a1fbfcf8286e4d44a3':
  cosmetics: Add '0' to float constants ending in '.'.

Conflicts:
	libavcodec/ra288.c

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

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