sunpy/sunpy-0.4-paper — pull request #45 by ayshih (2014-01-24 22:51:59+00:00)
Title: Affiliations

Git couldn't auto-merge Jack's PR after Andy's PR, so here's his affiliation again, plus mine.

Merging immediately