Elon mentioned at the news conference that the pitch/roll of the ship was 2-3 degrees for this landing, and that it should be easy to handle twice that, with a maximum of about 8-9 degrees.
After watching the video I don't know what Musk is talking about. Maybe he's talking about a maximum double amplitude.