[FFmpeg-cvslog] Merge commit '28306e6d620c109ddd672f7243adfbc2bbb3b18f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jun  2 10:30:35 2013 +0200| [4d4f5911d3121133929da7b859755860f93684fd] | committer: Michael Niedermayer

Merge commit '28306e6d620c109ddd672f7243adfbc2bbb3b18f'

* commit '28306e6d620c109ddd672f7243adfbc2bbb3b18f':
  network: factor out bind-listening code
  use my full first name instead of short one in copyrights

Conflicts:
	libavformat/tcp.c

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

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