[python-astropy] 01/02: Merge branch 'upstream' into debian

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole pushed a commit to branch debian
in repository python-astropy.

commit 93d4b9bbe87dadc1f35dfe28f9dbb2a454d1644e
Merge: a5fc8c4 d0de95a
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Thu Feb 19 09:05:15 2015 +0100

    Merge branch 'upstream' into debian

 CHANGES.rst                                        |    70 +-
 PKG-INFO                                           |     4 +-
 .../src/compiler.c => astropy/_compiler.c          |     0
 astropy/_erfa/core.c                               |  2026 ++--
 astropy/_erfa/core.py                              |     4 +-
 astropy/config/configuration.py                    |    25 +-
 astropy/config/tests/test_configs.py               |    20 +-
 astropy/convolution/boundary_extend.c              |  2645 +++--
 astropy/convolution/boundary_fill.c                |  2896 +++--
 astropy/convolution/boundary_none.c                |  2765 +++--
 astropy/convolution/boundary_wrap.c                |  2645 +++--
 astropy/coordinates/angles.py                      |    30 +-
 astropy/coordinates/tests/test_angles.py           |    38 +-
 astropy/coordinates/tests/test_frames.py           |    19 +-
 astropy/cython_version.py                          |     2 +-
 astropy/io/ascii/cparser.c                         | 10503 +++++++++++--------
 astropy/io/ascii/cparser.pyx                       |     2 +-
 astropy/modeling/tests/test_mappings.py            |     2 +-
 astropy/table/_np_utils.c                          |  1539 ++-
 astropy/version.py                                 |     8 +-
 astropy/vo/samp/hub.py                             |     6 +-
 astropy_helpers/CHANGES.rst                        |    23 +-
 astropy_helpers/astropy_helpers.egg-info/PKG-INFO  |     4 +-
 .../astropy_helpers.egg-info/SOURCES.txt           |    21 +-
 .../astropy_helpers/commands/build_ext.py          |     8 +-
 .../astropy_helpers/commands/setup_package.py      |     4 +
 .../astropy_helpers/{ => commands}/src/compiler.c  |     0
 astropy_helpers/astropy_helpers/src/__init__.py    |     0
 .../astropy_helpers/src/setup_package.py           |     2 -
 .../astropy_helpers/tests/test_git_helpers.py      |    64 +-
 .../astropy_helpers/tests/test_setup_helpers.py    |   143 +-
 astropy_helpers/astropy_helpers/version.py         |   202 +-
 astropy_helpers/astropy_helpers/version_helpers.py |     8 +-
 astropy_helpers/setup.py                           |     2 +-
 docs/conf.py                                       |     2 +-
 docs/development/affiliated-packages.rst           |    10 +-
 docs/known_issues.rst                              |   215 +-
 docs/whatsnew/1.0.rst                              |     7 +-
 licenses/LICENSE.rst                               |     2 +-
 setup.py                                           |     2 +-
 40 files changed, 13189 insertions(+), 12779 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/python-astropy.git