"Rory Pond: Came back from non-existence; witnessed the fall of Rome; survived the Apocalypse; and put Hitler in the cupboard." (And it's "Pond" because that's how it works.) >> most definitely Rory Pond
Or did toy story quote the doctor? <<< technically toy story quoted doctor who because at the point in history when that episode happened was before toy story was out. <<< unless the doctor watched toy story and then went back in time to quote it.