That must have happened, when I copied & pasted manually from one editor to the other (that's also where some indentation was lost). I'll go through the diff and put them back in.
(On a related note: Does it say "use <sp><sp> in the astropy coding guidelines? I know that's the emacs convention, but most other editors don't do that and most other systems don't require that.)