From: Dan Scott <dscott@laurentian.ca>
Date: Thu, 11 Sep 2014 01:55:46 +0000 (-0400)
Subject: Merge branch 'ldap_osul_2_4' into rel_2_4_mergery
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=refs%2Fheads%2Frel_2_4_mergery;p=contrib%2FConifer.git

Merge branch 'ldap_osul_2_4' into rel_2_4_mergery
---

0b38de4b9da1b0da8268d77d9b60c54b56f61c3d