Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 8 Nov 2011 11:54:15 +0000 (12:54 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 8 Nov 2011 11:54:15 +0000 (12:54 +0100)
commit9c0d8ca71863814e6233740d3b1cb2eccfd1f3d1
treee3619996aa2614e62ae459a52ceceb50f0ac27cc
parentce09010267fb12e01fff9f819f981818bbcbc295
parentab8d5874b0b644dffa60e4744815009f3970fc84
Merge branch 'master' into 0.11

Conflicts:
gst/gstelement.h
gst/gstghostpad.c
gst/gstminiobject.c
gst/gstcaps.c
gst/gstelement.h
gst/gstghostpad.c
gst/gststructure.c
libs/gst/base/gstbaseparse.c
libs/gst/base/gstbasesrc.c
plugins/elements/gstinputselector.c
plugins/elements/gstmultiqueue.c
tests/check/gst/gstpad.c
win32/common/libgstreamer.def