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

This commit is contained in:
Tim-Philipp Müller 2011-11-28 21:27:53 +00:00
commit c6985a9533

Diff content is not available