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)
commit1712818c17d46e42aae890da9f253b5ac1160aa2
treea91d9b6baeed4c01f3eae2a44c5871c55ee0be01
parent9cb748ee21bcdb81e2f8f42eb8ef2d25e3e58d15
parent59f3ceff480e293d21f90930ddac2ad4ed845317
Merge remote-tracking branch 'origin/master' into 0.11