Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Thu, 27 Oct 2011 14:08:22 +0000 (16:08 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Thu, 27 Oct 2011 14:08:22 +0000 (16:08 +0200)
commit4b6a22626340470c1de34dda0b63d529cf2aa760
treecb1b10a4d63a2a5612570a6794113a993231bc63
parentfc4684f4c643e6c1a225e28c87cc5267464b4c75
parent1b213d905ac2b9a1e015be6daf0dfeb92294154c
Merge branch 'master' into 0.11

Conflicts:
ext/pulse/pulseaudiosink.c
ext/pulse/pulsesink.c
ext/pulse/pulseaudiosink.c
ext/pulse/pulsesink.c
gst/equalizer/gstiirequalizer.c