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

This commit is contained in:
Tim-Philipp Müller 2011-11-27 23:33:45 +00:00
commit c1a4dc99ae

Diff content is not available