[FFmpeg-cvslog] Merge commit 'd010e95f86089abe9a3d4d4a66ac8102312d28a4'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jul 19 10:25:26 2013 +0200| [8740762c43dc92cfefa58769bb8cfade82aa695c] | committer: Michael Niedermayer

Merge commit 'd010e95f86089abe9a3d4d4a66ac8102312d28a4'

* commit 'd010e95f86089abe9a3d4d4a66ac8102312d28a4':
  avserver: Remove unused loadable module support

Conflicts:
	configure
	ffserver.c

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

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