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

This commit is contained in:
Tim-Philipp Müller 2011-10-31 14:51:32 +00:00
commit 52d8d0d060

Diff content is not available