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)
commitfd5d74734ea30c02fba2ae0129f03cbc96dc04c0
tree86e570d9726a6868b5519633e6a70cafe62131c5
parent72bcd7b3e204f993fe263acc5395a8928b8936cd
parent4b51fb8ae1a8e2019010305cc96c8397dc68000d
Merge remote-tracking branch 'origin/master' into 0.11
m4/gst-feature.m4