[osrm] 02/05: Merge tag 'upstream/5.3.1+ds'

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository osrm.

commit ad07044b35cdc7b0ad5442fb923e33050757cc3c
Merge: 1905c18 915a4dd
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Aug 4 20:19:53 2016 +0200

    Merge tag 'upstream/5.3.1+ds'
    
    Upstream version 5.3.1+ds

 .travis.yml                                       |   1 +
 CHANGELOG.md                                      |   6 ++
 CMakeLists.txt                                    |   2 +-
 features/guidance/turn-lanes.feature              | 109 ++++++++++++++++++++++
 src/extractor/extractor_callbacks.cpp             |  50 +++++-----
 src/extractor/guidance/intersection_generator.cpp |  15 ++-
 src/extractor/guidance/turn_lane_augmentation.cpp |  12 ++-
 src/extractor/guidance/turn_lane_handler.cpp      |  10 +-
 8 files changed, 179 insertions(+), 26 deletions(-)

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