Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Fri, 17 Feb 2012 22:49:21 +0000 (23:49 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Fri, 17 Feb 2012 22:49:21 +0000 (23:49 +0100)
commit82a43ad1ab6d206822259aa23335a791370bb97f
tree0e5bdcb464504827e81f5b4c014e2067aaecff0d
parentfdfe4ed445ee4df20675abe0289fee6817bef4e1
parentf76f7374ea2227b8422aa6c3b1e084fff0180d0a
Merge branch 'master' into 0.11

Conflicts:
gst/equalizer/gstiirequalizer.c
gst/audioparsers/gstmpegaudioparse.c
gst/equalizer/gstiirequalizer.c