Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Fri, 17 Feb 2012 08:16:32 +0000 (09:16 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Fri, 17 Feb 2012 08:16:32 +0000 (09:16 +0100)
commited4b967d162ce2aef6afd6d03c71ca23cba172d1
tree6127fd20aff2a982294d0ebc22c768024de47e95
parent7de44ab61be209b2a9d537ac34967db224766344
parent2e35999f68c530f3c1076ba6d4753c13bc72fff4
Merge branch 'master' into 0.11

Conflicts:
ext/mad/gstmad.c
ext/mad/gstmad.c