Merge branch 'master' into 0.11
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Thu, 24 Nov 2011 10:23:07 +0000 (11:23 +0100)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Thu, 24 Nov 2011 10:23:07 +0000 (11:23 +0100)
commit1fa356a23cd30a64d743ef1600348dc846f1ab5c
tree4698663d0514891fe47e1809d9ac64fb3156828e
parent13e78396535b31fc7cdc752224936ad4ffa6ce30
parent0280a3c29ffbc33665fa25ae001e91c9a44b801e
Merge branch 'master' into 0.11

Conflicts:
gst/gstpad.c
libs/gst/base/gstbaseparse.c
libs/gst/base/gstbaseparse.c
plugins/elements/gstmultiqueue.c