[python-geojson] 02/06: Merge tag 'upstream/1.2.1'

[Sebastiaan Couwenberg]

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

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

commit 8d9eeafa2fe7bd372b0f61541c7eba2061d2dad8
Merge: 221cf7f 78d2bb1
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Jun 27 14:42:53 2015 +0200

    Merge tag 'upstream/1.2.1'
    
    Upstream version 1.2.1

 CHANGELOG.rst       | 7 +++++++
 geojson/geometry.py | 9 ++++++++-
 setup.py            | 2 +-
 3 files changed, 16 insertions(+), 2 deletions(-)

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