Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Mon, 10 Oct 2011 09:45:49 +0000 (11:45 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Mon, 10 Oct 2011 09:45:49 +0000 (11:45 +0200)
commit05ad8a3432cf4b838274bd2d6a989047e904566f
tree8dd2832851172ad7005c505b02e2c6d4f49eaad0
parentf1088ed6478b6d3d8c005569af7f8cf8de2f811e
parenta7f508012c18f762a8bf07e4336929641df22ba3
Merge branch 'master' into 0.11

Conflicts:
ext/vorbis/gstvorbisenc.c
ext/vorbis/gstvorbisenc.c