Merge remote-tracking branch 'origin/master' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Thu, 12 Jan 2012 23:21:17 +0000 (23:21 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Thu, 12 Jan 2012 23:21:17 +0000 (23:21 +0000)
commit0461ed2adad12fbf19a605820ceed11f6acb031a
tree755d5d3d78fb6107525f16b476d73655d1b33742
parent345b6a58f4e56f400f928d9dddd5da207cca2637
parent70c6c2ae0cfd9fe20e31f5dc9c340973645bb079
Merge remote-tracking branch 'origin/master' into 0.11

Conflicts:
gst-libs/gst/pbutils/gstdiscoverer-types.c
gst-libs/gst/pbutils/gstdiscoverer.c
tests/check/Makefile.am
ext/ogg/gstoggdemux.c
ext/ogg/gstoggstream.c
ext/theora/gsttheoraparse.c
gst-libs/gst/pbutils/gstdiscoverer.c
gst-libs/gst/video/Makefile.am
tests/check/Makefile.am