[asl] 171/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 7e4d5a26ca04ac6e5fea0a925b92fdfcf57313f8
Merge: 9f9725c f0aac0c
Author: Avtech Scientific <AvtechScientific at users.noreply.github.com>
Date:   Tue Aug 18 20:53:59 2015 +0300

    Merge branch 'master' into develop

 COPYRIGHT.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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