astropy/astropy — pull request #581 by iguananaut (2012-12-20 22:04:26+00:00)
Title: Fits merge

This also fixes #549.

Conflicts:
README.txt

Conflicts:

astropy/io/fits/__init__.py
astropy/io/fits/header.py