Commit c97b3880 authored Sep 18, 2015 by Jeff Burke

Merge branch 'ac2' into s1840

Conflicts:
	projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java

There are no changes