Merge remote-tracking branch 'origin/master' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Sun, 27 Nov 2011 23:33:45 +0000 (23:33 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Sun, 27 Nov 2011 23:33:45 +0000 (23:33 +0000)
commitf88f6c18a35eef4a4ee9bb48e35f5f5b92fae6f7
tree061c3f06b16a752b8c357d90c5c4feab809d8335
parent619915ea740a0cd44ec2208b600e2bab70c2a57d
Merge remote-tracking branch 'origin/master' into 0.11