Merge remote-tracking branch 'origin/0.10'
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Thu, 29 Mar 2012 13:03:09 +0000 (15:03 +0200)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Thu, 29 Mar 2012 13:03:09 +0000 (15:03 +0200)
commit49f85b38b7ea2ebb6302f3c298b7ae996efaca9e
tree83ce484af66fabe2ea168f9e1d8da52d73f284f7
parent4ac5eebade59a40816da69e73f716a98743bfa39
parente7807712231f0674a3a0d31534e3d5699272e48d
Merge remote-tracking branch 'origin/0.10'

Conflicts:
configure.ac
ext/gdk_pixbuf/gstgdkpixbufoverlay.c