[python-osmapi] 02/05: Merge tag 'upstream/0.6.0'

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository python-osmapi.

commit 016fd196f4973c10be6eebd57c68677cd11c9cfd
Merge: 5ab60e8 1f5d976
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat May 30 16:25:36 2015 +0200

    Merge tag 'upstream/0.6.0'
    
    Upstream version 0.6.0

 .travis.yml                     |   1 +
 CHANGELOG.md                    |  11 ++
 CONTRIBUTING.md                 |  55 +++++++++
 osmapi/OsmApi.py                | 245 ++++++++++++++++++++++++++++++++++++----
 osmapi/__init__.py              |   2 +-
 requirements.txt                |   1 +
 setup.py                        |   2 +-
 tests/changeset_tests.py        |  30 ++---
 tests/fixtures/passwordfile.txt |   1 +
 tests/helper_tests.py           |  18 +++
 tests/node_tests.py             |  53 ++++++++-
 tests/relation_tests.py         |  32 ++++++
 tests/way_tests.py              |  22 ++++
 tox.ini                         |   2 +-
 14 files changed, 429 insertions(+), 46 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-osmapi.git