From: Dan Scott Date: Wed, 1 Aug 2012 21:37:30 +0000 (-0400) Subject: Merge branch 'master' of git.evergreen-ils.org:Evergreen into rel_2_3_mergery X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=0aa9c1084ce78e2d7075156750cdd67164d4e61d;p=contrib%2FConifer.git Merge branch 'master' of git.evergreen-ils.org:Evergreen into rel_2_3_mergery --- 0aa9c1084ce78e2d7075156750cdd67164d4e61d