Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Wed, 23 Nov 2011 09:50:53 +0000 (10:50 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Wed, 23 Nov 2011 09:50:53 +0000 (10:50 +0100)
commit7b45a7367b8e3cc1d2f570f7feb61db301acbaa0
tree77e530a2eb57a2a563e5ac6df609d53069302aa9
parente8fb8cb52351b0acea2c022a9397da9748daa336
parent042b4f9a294bf0ecaea85de13175b45d54602309
Merge branch 'master' into 0.11

Conflicts:
ext/ogg/gstoggmux.c
ext/ogg/gstoggdemux.c
ext/ogg/gstoggmux.c
ext/ogg/gstoggstream.c
gst/playback/gstplaysinkconvertbin.c