Merge remote-tracking branch 'origin/master' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Mon, 28 Nov 2011 21:31:25 +0000 (21:31 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Mon, 28 Nov 2011 21:31:25 +0000 (21:31 +0000)
commitbd3091913b3adbd6607129deec5245d4657f27eb
tree4c26a77b9979448e62f10ed1dd65cc32cde0cf4c
parent4548e811ea7549091f00160ab6bdfb4606126b08
parent213ce049ad0e79588267f990c946ec60fa32bee4
Merge remote-tracking branch 'origin/master' into 0.11