Commit 340cc966 authored Sep 14, 2015 by Jeff Burke

Merge branch 's1840' into ac2

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

There are no changes