[SCM] Core functionality for performing astronomy and astrophysics with Python branch, debian, updated. e7a44d7277a77dd6464c49f01c990e95afb2e133

[Ole Streicher]

The following commit has been merged in the debian branch:
commit e7a44d7277a77dd6464c49f01c990e95afb2e133
Merge: f96dff62e2d6bfb97830e86d2f333ecd31d9b6ee 7cdd7889ed28e1699229a1a90367500c4a893531
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Jan 30 09:33:38 2013 +0100

    Merge branch 'upstream' into debian
    
    Conflicts:
    	PKG-INFO
    	astropy/__init__.py
    	astropy/_constants/definition.py
    	astropy/constants/constant.py
    	astropy/coordinates/__init__.py
    	astropy/coordinates/angle_utilities.py
    	astropy/coordinates/coordsystems.py
    	astropy/coordinates/setup_package.py
    	astropy/coordinates/tests/accuracy/test_fk4_no_e_fk4.py
    	astropy/coordinates/tests/accuracy/test_fk4_no_e_fk5.py
    	astropy/coordinates/tests/accuracy/test_galactic_fk4.py
    	astropy/coordinates/tests/accuracy/test_icrs_fk5.py
    	astropy/coordinates/tests/test_api.py
    	astropy/cosmology/core.py
    	astropy/cosmology/tests/test_cosmology.py
    	astropy/io/ascii/__init__.py
    	astropy/io/ascii/basic.py
    	astropy/io/ascii/cds.py
    	astropy/io/ascii/connect.py
    	astropy/io/ascii/core.py
    	astropy/io/ascii/daophot.py
    	astropy/io/ascii/fixedwidth.py
    	astropy/io/ascii/ipac.py
    	astropy/io/ascii/latex.py
    	astropy/io/ascii/sextractor.py
    	astropy/io/ascii/tests/t/daophot2.dat
    	astropy/io/ascii/tests/test_cds_header_from_readme.py
    	astropy/io/ascii/tests/test_compressed.py
    	astropy/io/ascii/tests/test_connect.py
    	astropy/io/ascii/tests/test_ipac_definitions.py
    	astropy/io/ascii/tests/test_read.py
    	astropy/io/ascii/ui.py
    	astropy/io/misc/connect.py
    	astropy/io/misc/hdf5.py
    	astropy/io/misc/tests/test_hdf5.py
    	astropy/io/vo/tests/__init__.py
    	astropy/io/votable/connect.py
    	astropy/io/votable/tests/__init__.py
    	astropy/io/votable/tests/table_test.py
    	astropy/io/votable/tests/tree_test.py
    	astropy/io/votable/voexceptions.py
    	astropy/logger.py
    	astropy/nddata/convolution/boundary_extend.c
    	astropy/nddata/convolution/boundary_fill.c
    	astropy/nddata/convolution/boundary_none.c
    	astropy/nddata/convolution/boundary_wrap.c
    	astropy/nddata/flag_collection.py
    	astropy/nddata/nddata.py
    	astropy/nddata/nduncertainty.py
    	astropy/nddata/tests/test_flag_collection.py
    	astropy/nddata/tests/test_nddata.py
    	astropy/setup_helpers.py
    	astropy/sphinx/conf.py
    	astropy/sphinx/ext/edit_on_github.py
    	astropy/sphinx/themes/bootstrap-astropy/sourcelink.html
    	astropy/stats/tests/test_funcs.py
    	astropy/table/__init__.py
    	astropy/table/table.py
    	astropy/table/tests/test_column.py
    	astropy/table/tests/test_masked.py
    	astropy/table/tests/test_pprint.py
    	astropy/table/tests/test_row.py
    	astropy/table/tests/test_table.py
    	astropy/tests/helper.py
    	astropy/time/__init__.py
    	astropy/time/core.py
    	astropy/time/setup_package.py
    	astropy/time/sofa_time.c
    	astropy/time/tests/test_basic.py
    	astropy/time/tests/test_delta.py
    	astropy/time/tests/test_guess.py
    	astropy/units/__init__.py
    	astropy/units/astrophys.py
    	astropy/units/cgs.py
    	astropy/units/core.py
    	astropy/units/equivalencies.py
    	astropy/units/format/cds.py
    	astropy/units/format/generic.py
    	astropy/units/quantity.py
    	astropy/units/si.py
    	astropy/units/tests/__init__.py
    	astropy/units/tests/test_format.py
    	astropy/units/tests/test_quantity.py
    	astropy/units/tests/test_units.py
    	astropy/utils/data.py
    	astropy/utils/misc.py
    	astropy/version.py
    	astropy/version_helpers.py
    	astropy/wcs/src/docstrings.c
    	astropy/wcs/tests/test_wcsprm.py
    	docs/coordinates/index.rst
    	docs/cosmology/index.rst
    	docs/index.rst
    	docs/table/io.rst
    	docs/time/index.rst
    	docs/units/index.rst
    	docs/units/quantity.rst
    	docs/whatsnew/0.2.rst
    	setup.py


-- 
Core functionality for performing astronomy and astrophysics with Python