Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 21 Feb 2012 09:06:16 +0000 (10:06 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 21 Feb 2012 09:06:16 +0000 (10:06 +0100)
commit320d0838f376e939e8332e84dee72b4c625cbde8
treee0a671528d6627f7416003db1d376ba5d63677df
parente4e0d3ce02c5e9a6c79d4826fc52e743e0221fba
parent342a04c9d2a7031035d5b3ad55aeceddb15f04bc
Merge branch 'master' into 0.11

Conflicts:
gst/colorspace/colorspace.c
ext/schroedinger/gstschroenc.c