sunpy/eitwave — pull request #18 by ayshih (2012-10-01 19:33:22+00:00)
Title: Crazy merging to unify the code back in master

I will merge this myself once I confirm that it obviates Steve's 4-month-old(!) pull request.