[asl] 165/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 c14df802c6af40c8416e4ced9b603c2686dafe93
Merge: e5e2c56 a14703f
Author: Avtech Scientific <AvtechScientific at users.noreply.github.com>
Date:   Mon Aug 17 10:27:10 2015 +0300

    Merge branch 'develop'

 README.md                            | 2 +-
 src/acl/aclHardware.cxx              | 5 ++---
 src/utilities/aslParametersManager.h | 4 +---
 3 files changed, 4 insertions(+), 7 deletions(-)

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