[osrm] 02/04: Merge tag 'upstream/5.2.6+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 31f7fc6164cb2ccb95f618b06b1f5e87e0179f43
Merge: bc438b9 772829c
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Jun 25 02:07:57 2016 +0200

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

 CHANGELOG.md                               | 4 ++++
 CMakeLists.txt                             | 2 +-
 src/util/coordinate_calculation.cpp        | 5 ++++-
 unit_tests/util/coordinate_calculation.cpp | 7 +++++++
 4 files changed, 16 insertions(+), 2 deletions(-)

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