Merge remote-tracking branch 'origin/master' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Thu, 19 Jan 2012 14:15:08 +0000 (14:15 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Thu, 19 Jan 2012 14:15:08 +0000 (14:15 +0000)
commit7f96f7dbfbc7f4d492465201ebdc169ac6f9e8a4
treefd834bfcd562560fcf9f4ee0628d240034560de6
parent2a59016f13316d1e7992fca4d3d8aab20c2ce512
parent17fa4abf49d31cf5dcc2994bdbaa86e45a3fb69f
Merge remote-tracking branch 'origin/master' into 0.11
m4/gst-args.m4