Merge remote-tracking branch 'origin/master' into 0.11

This commit is contained in:
Tim-Philipp Müller 2012-01-13 00:11:54 +00:00
commit 2ca9496cdc

Diff content is not available