Merge remote-tracking branch 'origin/master' into 0.11
authorEdward Hervey <edward.hervey@collabora.co.uk>
Fri, 25 Nov 2011 11:48:58 +0000 (12:48 +0100)
committerEdward Hervey <edward.hervey@collabora.co.uk>
Fri, 25 Nov 2011 11:48:58 +0000 (12:48 +0100)
commita8024bb6989d524d11c8020ac67a60e63bee46ff
tree4c98d7721eff86a14e31acffabd2a09b1eaaa81b
parent296786c01121a2f6258bfb2494d8b56ba4861afe
parent32e9de842fc963a4af4d9a7148f7e3c909ab96c8
Merge remote-tracking branch 'origin/master' into 0.11

Conflicts:
ext/faac/gstfaac.c
ext/opus/gstopusdec.c
ext/opus/gstopusenc.c
gst/audiovisualizers/gstspacescope.c
gst/colorspace/colorspace.c
ext/opus/gstopusdec.c
ext/opus/gstopusenc.c
ext/opus/gstopusheader.c