Madonna and Deadmau5 have made up with each other on Twitter following her recent onstage drug comments.
Madonna, Deadmau5 make up on Twitter over drug comments