Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Mon, 20 Feb 2012 15:07:50 +0000 (16:07 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Mon, 20 Feb 2012 15:07:50 +0000 (16:07 +0100)
commit0dbfad52d9311622985f4b7dd947e69376fc8b36
treea7fc098dc7bb4b250c34bc03380daa442c7d56aa
parente45e7a3d1ff68b052f7e3fc97aac51e699b953c5
Merge branch 'master' into 0.11

Conflicts:
ext/opus/gstopusparse.c
gst/colorspace/colorspace.c