sunpy/sunpy — pull request #395 by Cadair (2013-02-18 18:12:50+00:00)
Title: Merge Staging to Master

We need to keep master upto date!