Merge remote-tracking branch 'origin/master' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Thu, 8 Mar 2012 19:55:30 +0000 (19:55 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Thu, 8 Mar 2012 19:55:30 +0000 (19:55 +0000)
commite09fe53a227594b6bfdab66aa627ef026e9823ff
tree3cd7dd45c211feef0a67490a3bb1cc0388902529
parent3e8d6d6064cbf94751f40dad9159c994e7d138ae
parent4d2adb0249d3a339284c1cb601b1fb60e45e03bf
Merge remote-tracking branch 'origin/master' into 0.11

Conflicts:
common
gst/gstpad.h
gst/gsttask.c
libs/gst/base/gstcollectpads2.h
gst/gstpad.c
gst/gstpad.h
gst/gsttask.c
libs/gst/base/gstcollectpads2.h
tests/check/Makefile.am