Merge branch 'master' into 0.11

Conflicts:
	gst/gstghostpad.h

diff --cc docs/gst/gstreamer-sections.txt
Simple merge

diff --cc gst/gstghostpad.h
index f1afb41,308ab70..3225e2a
--- 1/gst/gstghostpad.h
--- 2/gst/gstghostpad.h
+++ b/gst/gstghostpad.h
@@@ -66,7 -66,8 +66,7 @@@ const GstQueryType* gst_proxy_pad_query
  gboolean            gst_proxy_pad_event_default                  (GstPad *pad, GstEvent *event);
  gboolean            gst_proxy_pad_query_default                  (GstPad *pad, GstQuery *query);
  GstIterator*        gst_proxy_pad_iterate_internal_links_default (GstPad *pad);
- GstFlowReturn       gst_proxy_pad_chain_default                  (GstPad *pad, GstBuffer *buf);
 -GstFlowReturn       gst_proxy_pad_bufferalloc_default            (GstPad *pad, guint64 offset, guint size, GstCaps *caps, GstBuffer **buf);
+ GstFlowReturn       gst_proxy_pad_chain_default                  (GstPad *pad, GstBuffer *buffer);
  GstFlowReturn       gst_proxy_pad_chain_list_default             (GstPad *pad, GstBufferList *list);
  GstFlowReturn       gst_proxy_pad_getrange_default               (GstPad *pad, guint64 offset, guint size, GstBuffer **buffer);
  gboolean            gst_proxy_pad_checkgetrange_default          (GstPad *pad);

diff --cc gst/gstminiobject.c
Simple merge