[asl] 94/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 71ed66953483b92de516a7a3471ede3954939788
Merge: 4173ee5 fbf8afb
Author: Avtech Scientific <AvtechScientific at users.noreply.github.com>
Date:   Tue Jul 14 00:10:48 2015 +0300

    Merge branch 'develop'

 README.md                              | 6 +++---
 src/acl/aclHardware.cxx                | 9 ++++++---
 src/acl/aclHardware.h                  | 6 +++---
 src/utilities/aslParametersManager.cxx | 8 ++++----
 4 files changed, 16 insertions(+), 13 deletions(-)

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