Merge branch 'master' into 0.11
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Thu, 8 Sep 2011 12:30:07 +0000 (14:30 +0200)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Thu, 8 Sep 2011 12:30:07 +0000 (14:30 +0200)
commit97560eb9cb9629c90cca9c28bb4a4a2955c42227
tree8fc77f478b9d15166c85c083e24d0ee0e6b890ad
parent43538e2e75b4bdc5fc71a62b472a4b223472c059
parent7a82ed41f8139a7c22184d60949e380c0aa39a44
Merge branch 'master' into 0.11

Conflicts:
gst/gstpad.c