Merge remote-tracking branch 'conifer/feature/ldap_osul_2_7' into rel_2_7_mergery
authorDan Scott <dscott@laurentian.ca>
Sun, 7 Dec 2014 14:07:58 +0000 (09:07 -0500)
committerDan Scott <dscott@laurentian.ca>
Sun, 7 Dec 2014 14:07:58 +0000 (09:07 -0500)

Trivial merge