[osrm] 02/04: Merge tag 'upstream/5.2.5+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 ec8e7b6fd8b89fd7a7fe5761b912edaf6fc2aaa7
Merge: 65d6ef6 3cad9df
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Jun 23 07:01:32 2016 +0200

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

 CHANGELOG.md                            |  4 ++++
 CMakeLists.txt                          |  2 +-
 features/step_definitions/data.js       |  2 +-
 features/testbot/fixed.feature          | 15 +++++++++++++++
 src/engine/guidance/post_processing.cpp |  4 ++--
 5 files changed, 23 insertions(+), 4 deletions(-)

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