From: Dan Scott Date: Fri, 3 Aug 2012 16:26:28 +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=ee081034635f8f8bce05fa4df670c429059cc8f4;p=contrib%2FConifer.git Merge branch 'master' of git.evergreen-ils.org:Evergreen into rel_2_3_mergery --- ee081034635f8f8bce05fa4df670c429059cc8f4