[asl] 154/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 fc3ba24476b03c51af3731aeab00a81d11bb2582
Merge: 4ab6e8f 16463aa
Author: Avtech Scientific <AvtechScientific at users.noreply.github.com>
Date:   Thu Aug 13 21:07:06 2015 +0300

    Merge branch 'master' into develop

 COPYRIGHT.md                                           | 8 ++++----
 cmake/{ASL.pc.cmake.in => ASL.pc.in}                   | 0
 doc/Developer-Guide/{Doxyfile.cmake.in => Doxyfile.in} | 0
 3 files changed, 4 insertions(+), 4 deletions(-)

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