astropy/astropy — pull request #917 by iguananaut (2013-03-28 20:41:10+00:00)
Title: Merge branch 'master' into astropy

Merges up through r2072 from PyFITS

Fixes issues #256, #309 in Astropy, and several issues from PyFITS' bugtracker.