Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Thu, 27 Oct 2011 14:13:56 +0000 (16:13 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Thu, 27 Oct 2011 14:13:56 +0000 (16:13 +0200)
commitce41348f7819d548f7ed6f88991b5d91ea24af8e
tree95435997db20db8fc7b17a5de211ffe32bbb4c28
parent69f8921e2c1809bfa750897581b29abeadadd8da
parent48275dc0719edcca12eb6602bedc313bda224d59
Merge branch 'master' into 0.11
ext/assrender/gstassrender.c