Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Wed, 28 Sep 2011 15:39:12 +0000 (17:39 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Wed, 28 Sep 2011 15:39:12 +0000 (17:39 +0200)
commit762602d56a13ce09caf7ceba3e48da397919c66a
tree58553103d612a4435d26e0ad16558c0f4af27582
parent2e069225b974a73a0079fe621d6981499e6408c0
parente8bcd41d73c91553867c2bddfa56f39c69ce983d
Merge branch 'master' into 0.11

Conflicts:
ext/flac/gstflacenc.c
ext/flac/gstflacenc.c