Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Thu, 22 Mar 2012 09:45:06 +0000 (10:45 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Thu, 22 Mar 2012 09:45:06 +0000 (10:45 +0100)
commit007a00cd1bb4dfacc7c5aefb71f54770c2d21093
treecbe8a9007409ceec8c821397a86d888920299c76
parentab7d8886f039b709ed767642a46073bea9630fa6
parentbb78f15e42c9fd52ed33b17656e347ca7fb307d3
Merge branch 'master' into 0.11

Conflicts:
configure.ac
libs/gst/base/gstcollectpads2.c