[osrm] 02/04: Merge tag 'upstream/4.9.1+ds'

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository osrm.

commit 7ec33122b1339037369dfb02fe084c49b60e9ab3
Merge: 3c1eaac c52c682
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Jan 22 18:39:45 2016 +0100

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

 data_structures/shared_memory_factory.hpp    |  4 ++
 descriptors/json_descriptor.hpp              |  3 +
 extractor/edge_based_graph_factory.cpp       | 19 +++++-
 library/osrm_impl.cpp                        | 11 +++-
 plugins/match.hpp                            |  6 +-
 plugins/trip.hpp                             | 38 ++++++-----
 plugins/viaroute.hpp                         | 43 +++++++------
 server/data_structures/shared_datafacade.hpp | 96 ++++++++++++++++++----------
 8 files changed, 139 insertions(+), 81 deletions(-)

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