[asl] 73/177: Merge branch 'master' into develop

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch master
in repository asl.

commit 0ef5a24adb8e777ce3ae5e6e4209df266d94a121
Merge: aee263c eb0ff4a
Author: Avtech Scientific <AvtechScientific at users.noreply.github.com>
Date:   Mon Jul 6 22:40:50 2015 +0300

    Merge branch 'master' into develop

 README.md                             | 2 +-
 examples/flow/locomotive_in_tunnel.cc | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/asl.git