Merge remote-tracking branch 'origin/0.10'
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Thu, 29 Mar 2012 13:10:09 +0000 (15:10 +0200)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Thu, 29 Mar 2012 13:10:09 +0000 (15:10 +0200)
commitfa44d050f52468e1b8ad930f03fd0188946b0170
treeba9512c7241514d9a9690e215f49afdbecb34b99
parent1dcb142307754250fc0707831d348cba25cf66aa
parent4148d605ad00854b43eb36db3db2078ab3645881
Merge remote-tracking branch 'origin/0.10'