Merge remote-tracking branch 'origin/master' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Sun, 27 Nov 2011 23:31:43 +0000 (23:31 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Sun, 27 Nov 2011 23:31:43 +0000 (23:31 +0000)
commitdc540c23dae5c7ecaf060fdd6fbde21c2140be89
treed4944141cbe07c4f451238253755c92a594e0183
parent17240ac9ec0a3a7baa723547115d2dabfba80d1b
parentb5bf029401558588be1f474e1dfc7201c1e78be4
Merge remote-tracking branch 'origin/master' into 0.11

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