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

This commit is contained in:
Tim-Philipp Müller 2011-11-28 21:31:25 +00:00
commit 64d7acad26

Diff content is not available