From: Dan Scott Date: Sun, 7 Dec 2014 14:07:58 +0000 (-0500) Subject: Merge remote-tracking branch 'conifer/feature/ldap_osul_2_7' into rel_2_7_mergery X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=6f854c09f38b9ecd4332423a5b7cb16da6c6d0b4;p=contrib%2FConifer.git Merge remote-tracking branch 'conifer/feature/ldap_osul_2_7' into rel_2_7_mergery --- 6f854c09f38b9ecd4332423a5b7cb16da6c6d0b4