Merge remote-tracking branch 'origin/master' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Mon, 12 Mar 2012 13:11:26 +0000 (13:11 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Mon, 12 Mar 2012 13:11:26 +0000 (13:11 +0000)
1  2 
m4/gst-feature.m4

Simple merge