Merge remote-tracking branch 'origin/master' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Fri, 2 Dec 2011 01:58:30 +0000 (01:58 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Fri, 2 Dec 2011 01:58:30 +0000 (01:58 +0000)
commitd895ac645f017f4d048b0fcbde44b3ef6c9fb4f3
tree205b2f58447f15a79fda0714c41f1ee428f7dd6b
parentf1558baf835105dd81c74ea8a6b097f5c3b60471
parentf18f23896875cb1fb39da0745713505773109aa9
Merge remote-tracking branch 'origin/master' into 0.11

Conflicts:
docs/plugins/inspect/plugin-esdsink.xml
docs/plugins/inspect/plugin-gconfelements.xml
ext/pulse/pulseaudiosink.c
gst/matroska/matroska-demux.c
gst/matroska/matroska-mux.c
gst/multifile/gstmultifilesink.c
configure.ac
docs/plugins/Makefile.am
docs/plugins/gst-plugins-good-plugins-docs.sgml
docs/plugins/gst-plugins-good-plugins-sections.txt
gst/effectv/gstripple.c
gst/matroska/matroska-demux.c
gst/matroska/matroska-ids.h
gst/matroska/matroska-mux.c
gst/multifile/gstmultifilesink.c
gst/multifile/gstsplitfilesrc.c
tests/check/Makefile.am