Merge branch '0.10'
authorWim Taymans <wim.taymans@collabora.co.uk>
Thu, 5 Apr 2012 08:36:08 +0000 (10:36 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Thu, 5 Apr 2012 08:36:08 +0000 (10:36 +0200)
commit0ba0f7cd5b905848b0acb8859ff42b32951b1af8
treebeb6575b53032e4559dc8ab22b9016de2db84dec
parente603d08e878f42d8f397166b2d7f8ee862cce5a0
parent67ccad0621d1867b8777c2ccafbf186046725de5
Merge branch '0.10'

Conflicts:
plugins/elements/gstqueue2.c
plugins/elements/gstqueue2.c