Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Fri, 17 Feb 2012 22:46:17 +0000 (23:46 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Fri, 17 Feb 2012 22:46:17 +0000 (23:46 +0100)
commit268d52fd331e9e2e211de1b1e386c62b6afae4df
tree8f6934be75fe7e92e5842e1d69774cb128460432
parenta350c28aedae9b1e329f1f971d612fb06a226d45
parent0f6c8a27a780e6f916d0ba2abd7c1c2607f26098
Merge branch 'master' into 0.11

Conflicts:
gst-libs/gst/rtsp/gstrtspconnection.c
win32/common/libgstaudio.def
docs/libs/gst-plugins-base-libs-sections.txt
gst-libs/gst/audio/gstaudiodecoder.c
gst-libs/gst/rtsp/gstrtspconnection.c