From: Dan Scott Date: Tue, 7 Aug 2012 18:32:34 +0000 (-0400) Subject: Merge branch 'rel_2_3' of git.evergreen-ils.org:Evergreen into rel_2_3_mergery X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=be42079cc94d0bf43c2bbfd2e53c6d99c5477cf8;p=contrib%2FConifer.git Merge branch 'rel_2_3' of git.evergreen-ils.org:Evergreen into rel_2_3_mergery --- be42079cc94d0bf43c2bbfd2e53c6d99c5477cf8