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

This commit is contained in:
Tim-Philipp Müller 2011-12-08 17:32:19 +00:00
commit af4d5c7fd6

Diff content is not available