Merge remote-tracking branch 'origin/0.10'
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Wed, 4 Apr 2012 10:06:08 +0000 (12:06 +0200)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Wed, 4 Apr 2012 10:06:08 +0000 (12:06 +0200)
commit4c0b7fd03b9ca24d0aff6a68519e382b80d2a196
tree54676dd75908366a2125da7cf80ecd81502b65e0
parentbc07e445466f9ca39e43583745134f66b4acb2c1
parent3b525d1147fd1a632a5dfa07b0ef02155eac585f
Merge remote-tracking branch 'origin/0.10'