From: Dan Scott Date: Tue, 4 Jun 2013 17:50:36 +0000 (-0400) Subject: Merge branch 'rel_2_4_mergery' of git.evergreen-ils.org:contrib/Conifer into rel_2_4_... X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=f3d6b990137082eed4fe45e3e0c36737f42505e1;p=contrib%2FConifer.git Merge branch 'rel_2_4_mergery' of git.evergreen-ils.org:contrib/Conifer into rel_2_4_mergery_tpac --- f3d6b990137082eed4fe45e3e0c36737f42505e1