Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Mon, 10 Oct 2011 09:48:20 +0000 (11:48 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Mon, 10 Oct 2011 09:48:20 +0000 (11:48 +0200)
commitaea9b5e8c806da2f026d2493925e8a470ab1fe40
tree7842f35f2c49039877b6f3063ebfea67b082030d
parentb09704020c8c6eb99b6481c2166159b8d03d918b
parent00a91fc0617af1bd67dac9c7af8db8389bfd6bd0
Merge branch 'master' into 0.11

Conflicts:
ext/speex/gstspeexenc.c
ext/speex/gstspeexenc.c