Merge remote-tracking branch 'origin/master' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Mon, 26 Dec 2011 00:12:57 +0000 (00:12 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Mon, 26 Dec 2011 00:12:57 +0000 (00:12 +0000)
commit2ce993331a1d96b4315571ad83753cd59ad75d8f
tree6642fb2b206086daf22ee453e4b23e22ff50f240
parent1e6ed597246d7ab9f19849ee8fa462ef6266a2f9
parent59a7a684581c07b33147921f70297cd8e6d770b5
Merge remote-tracking branch 'origin/master' into 0.11