Merge remote-tracking branch 'origin/master' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Mon, 28 Nov 2011 21:27:53 +0000 (21:27 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Mon, 28 Nov 2011 21:27:53 +0000 (21:27 +0000)
commitc6985a9533422d036d99f6dac8eb1ffa4cba7bd5
tree0d9fc41552fee5b7b3e3ca36ca454dec9740eff2
parent04887268c8257c2bcc16fee74d6dfd53dd572555
parentc0e101e93fa178fb3cb62bed64117c005583b032
Merge remote-tracking branch 'origin/master' into 0.11