sunpy/sunpy — pull request #412 by Cadair (2013-03-16 12:12:18+00:00)
Title: Update staging again.

Update Staging into Master