[mapbox-variant] 02/05: Merge tag 'upstream/1.1.5'

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository mapbox-variant.

commit 5920104d7bce08f6b65e2e53272f7ecb57e3d4c1
Merge: 99ba782 66aad21
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Jan 18 20:58:05 2017 +0100

    Merge tag 'upstream/1.1.5'
    
    Upstream version 1.1.5

 .travis.yml                    | 188 +++++++++++++++++++++++++----------------
 Makefile                       |  92 +++++++++++++-------
 README.md                      |   2 +-
 include/mapbox/variant.hpp     |  16 +++-
 package.json                   |  10 +++
 test/t/binary_visitor_impl.hpp |   4 +-
 6 files changed, 204 insertions(+), 108 deletions(-)

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