Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Wed, 24 Aug 2011 09:04:53 +0000 (11:04 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Wed, 24 Aug 2011 09:04:53 +0000 (11:04 +0200)
commit232a5a3d0a2b5ca890968e6234afb7f3715c9307
tree866afca578c41596a1f330ffa0231caee090b56f
parente78b66f5a32bc6afbb68352910ef9d8ce4c24cfa
parent7b8b0fa1bbc22bb08e291c001e4413b47d0b120e
Merge branch 'master' into 0.11

Conflicts:
ext/ogg/gstoggmux.c
ext/vorbis/gstvorbisenc.c
ext/ogg/gstoggdemux.c
ext/ogg/gstoggmux.c
ext/ogg/gstoggstream.c
ext/vorbis/gstvorbisenc.c