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

This commit is contained in:
Tim-Philipp Müller 2011-11-26 19:51:37 +00:00
commit d3264c4b9d

Diff content is not available