Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 4 Oct 2011 15:50:33 +0000 (17:50 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 4 Oct 2011 15:50:33 +0000 (17:50 +0200)
commit76a13cbcdc3f1f9b3ac009e2e88997794624de27
tree15ea2398545d8089fcc07dfb5a5ab368aebbae67
parentf9863d1274841ffa83f878c1cff7c0a25acebb78
parentfa2d16b905447906d55290a312e3472b4138df9f
Merge branch 'master' into 0.11

Conflicts:
ext/amrnb/amrnbdec.c
ext/amrnb/amrnbdec.c