Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 4 Oct 2011 15:39:17 +0000 (17:39 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 4 Oct 2011 15:39:17 +0000 (17:39 +0200)
commit544aa9773a3b28c778e6b75cc5bfa4c89e4887a2
tree07fb0322f0f931d7f3e03a2f3c4d1b41d3decd5a
parent4abfeaff18846f780eaf0a44e4f4d631a8b7cf90
parentfafbc109f1af5c601486af391166e55e6b88197f
Merge branch 'master' into 0.11
gst/gstquery.c
libs/gst/base/gstbaseparse.c