Merge branch 'master' into 0.11
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Thu, 8 Sep 2011 12:42:00 +0000 (14:42 +0200)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Thu, 8 Sep 2011 12:42:00 +0000 (14:42 +0200)
commit0f654f3febf02df2897b435e8bf2d9cfe87f449b
treeca0ab7eb1f8691576ab09cfed3aafde802d0bd81
parent4529c6dc325d2009670fe0f9145f5a6b867aba43
parent5f5d832a3bcff0828758f164fcb13c4258aefb36
Merge branch 'master' into 0.11

Conflicts:
docs/libs/Makefile.am
tests/check/elements/decodebin2.c
docs/libs/Makefile.am
docs/plugins/Makefile.am
ext/theora/gsttheoraenc.c
gst-plugins-base.spec.in
gst/audiotestsrc/gstaudiotestsrc.h
gst/playback/gstdecodebin2.c
gst/playback/gstplaysink.c
tests/check/elements/audiorate.c