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)
commit6f854c09f38b9ecd4332423a5b7cb16da6c6d0b4
treec7dd98a1ee7d3c995c48916a9d3a803eaf36c2f9
parent12de31ba915f560249718bae583514ff617ff89e
parentb4cc78f4a2ddcb64609602b062854f8783f7b31c
Merge remote-tracking branch 'conifer/feature/ldap_osul_2_7' into rel_2_7_mergery