Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Wed, 17 Aug 2011 13:52:18 +0000 (15:52 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Wed, 17 Aug 2011 13:52:18 +0000 (15:52 +0200)
commitce1e7cb10889a2fe26ced685b711d358f9d49bea
treeee627ea6b2c9a6f89398a806d2e7c198bad7b33e
parentbe4f60b0622ac25245830b3d7b601394559d54fe
parent3e0134f51fe174a1c68422b55147b2f2a2b07373
Merge branch 'master' into 0.11

Conflicts:
ext/flac/gstflacdec.c
ext/flac/gstflacdec.c