[osrm] 02/04: Merge tag 'upstream/5.2.4+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 46d7e4ffae0899b1f27b31f69253cfbdca28db8e
Merge: f65327a 934a0dd
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Jun 22 20:53:05 2016 +0200

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

 CHANGELOG.md                              |   9 +++
 features/guidance/intersections.feature   |  12 ++--
 features/guidance/roundabout.feature      | 109 ++++++++++++++++++++----------
 features/step_definitions/matching.js     |  14 ++++
 features/testbot/matching.feature         |  18 +++++
 include/extractor/guidance/toolkit.hpp    |  20 ++++++
 package.json                              |   3 +-
 src/engine/guidance/assemble_overview.cpp |   4 +-
 src/engine/guidance/post_processing.cpp   |  28 ++++----
 src/extractor/guidance/turn_analysis.cpp  |   9 ++-
 src/extractor/raster_source.cpp           |   8 ++-
 unit_tests/extractor/raster_source.cpp    |  64 +++++++++---------
 12 files changed, 200 insertions(+), 98 deletions(-)

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