Merge remote-tracking branch 'origin/master' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Fri, 20 Jan 2012 15:58:00 +0000 (15:58 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Fri, 20 Jan 2012 15:58:00 +0000 (15:58 +0000)
1  2 
m4/gst-check.m4

diff --cc m4/gst-check.m4
Simple merge