[asl] 125/177: Merge branch '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 266a8284d29b97faa4b80fca99f2fec05ae3bd9d
Merge: 5c9057e 6e6700e
Author: Avtech Scientific <AvtechScientific at users.noreply.github.com>
Date:   Wed Jul 29 17:30:50 2015 +0300

    Merge branch 'develop'

 NEWS.md                     | 1 +
 README.md                   | 4 ++--
 cmake/ASLBuildOptions.cmake | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

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