From: Dan Scott Date: Tue, 4 Sep 2012 18:27:30 +0000 (-0400) Subject: Merge remote-tracking branch 'origin/rel_2_3' into rel_2_3_mergery X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=cd94d86890fb57bffe6af9c315e8e27ac6342fd9;p=contrib%2FConifer.git Merge remote-tracking branch 'origin/rel_2_3' into rel_2_3_mergery Conflicts: Open-ILS/examples/apache/eg_vhost.conf Open-ILS/src/Makefile.am Open-ILS/src/perlmods/lib/OpenILS/WWW/EGWeb.pm Open-ILS/src/templates/opac/parts/place_hold.tt2 Signed-off-by: Dan Scott --- cd94d86890fb57bffe6af9c315e8e27ac6342fd9