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
This commit is contained in:
Edward Hervey 2011-11-25 12:48:58 +01:00
commit d459955d0d

Diff content is not available