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

[Ole Streicher]

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

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

commit 72dd79753d7189aaadf25677a89f77d89eb0e3f5
Merge: b0dbb33 b27f8f8
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Jul 16 20:21:30 2014 +0200

    Merge branch 'upstream' into debian

 CHANGES.rst                                        |  15 +++++---
 PKG-INFO                                           |   4 +-
 ah_bootstrap.py                                    |  35 ++++++++++++-----
 astropy/config/configuration.py                    |   3 +-
 astropy/convolution/boundary_extend.c              |   4 +-
 astropy/convolution/boundary_fill.c                |   4 +-
 astropy/convolution/boundary_none.c                |   4 +-
 astropy/convolution/boundary_wrap.c                |   4 +-
 astropy/logger.py                                  |   3 +-
 astropy/table/_np_utils.c                          |   4 +-
 astropy/table/table.py                             |  11 ++++++
 astropy/table/tests/test_item_access.py            |  15 ++++++--
 astropy/time/erfa_time.c                           |   4 +-
 astropy/version.py                                 |   4 +-
 astropy_helpers/CHANGES.rst                        |   2 +-
 astropy_helpers/CONTRIBUTING.md                    |  20 ++++++++++
 astropy_helpers/LICENSE.rst                        |   2 +-
 astropy_helpers/README.rst                         |  38 +++++++++----------
 astropy_helpers/ah_bootstrap.py                    |  35 ++++++++++++-----
 astropy_helpers/astropy_helpers.egg-info/PKG-INFO  |  42 ++++++++++-----------
 astropy_helpers/astropy_helpers/__init__.pyc       | Bin 283 -> 291 bytes
 .../astropy_helpers/compat/__init__.pyc            | Bin 1048 -> 1080 bytes
 astropy_helpers/astropy_helpers/git_helpers.pyc    | Bin 3169 -> 3193 bytes
 astropy_helpers/astropy_helpers/setup_helpers.pyc  | Bin 47295 -> 47767 bytes
 .../astropy_helpers/sphinx/ext/automodsumm.py      |   6 +--
 .../sphinx/ext/tests/test_automodsumm.py           |   1 +
 .../astropy_helpers/sphinx/ext/viewcode.py         |   8 +++-
 .../astropy_helpers/sphinx/setup_package.pyc       | Bin 433 -> 433 bytes
 .../astropy_helpers/src/setup_package.pyc          | Bin 311 -> 311 bytes
 astropy_helpers/astropy_helpers/test_helpers.pyc   | Bin 7844 -> 7884 bytes
 .../astropy_helpers/tests/test_ah_bootstrap.py     |  35 +++++++++++------
 astropy_helpers/astropy_helpers/utils.pyc          | Bin 5399 -> 5495 bytes
 astropy_helpers/astropy_helpers/version.py         |   4 +-
 astropy_helpers/astropy_helpers/version.pyc        | Bin 3473 -> 3494 bytes
 .../astropy_helpers/version_helpers.pyc            | Bin 5015 -> 5047 bytes
 astropy_helpers/setup.py                           |   2 +-
 docs/index.rst                                     |   2 +-
 docs/known_issues.rst                              |  35 +++++++++++++++++
 docs/whatsnew/0.4.rst                              |  22 ++++++++++-
 setup.py                                           |   2 +-
 40 files changed, 252 insertions(+), 118 deletions(-)

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