[modestmaps-py] 07/14: Merge tag 'upstream/1.4.6'

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository modestmaps-py.

commit 18e9ec8f130e35dc733f73d84b3e543cd4a737e6
Merge: 3470168 221e97b
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Aug 16 15:31:10 2015 +0200

    Merge tag 'upstream/1.4.6'
    
    Upstream version 1.4.6

 ._VERSION               | Bin 171 -> 0 bytes
 ._setup.py              | Bin 171 -> 0 bytes
 ModestMaps/Providers.py |   2 +-
 ModestMaps/Stamen.py    |  59 ++++++++++++++++++++++++++++++++++++++++++++++++
 ModestMaps/VERSION      |   1 +
 ModestMaps/__init__.py  |  20 +++++++++++-----
 PKG-INFO                |  11 +++++++++
 VERSION                 |   1 -
 setup.py                |   4 ++--
 9 files changed, 88 insertions(+), 10 deletions(-)

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