From: Dan Scott Date: Wed, 19 Jun 2013 15:40:16 +0000 (-0400) Subject: Merge branch 'rel_2_4' of git.evergreen-ils.org:Evergreen into user/dbs/tpac_osul_2_4 X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=1fab95df0d7c0e04465994e1142fcb8eb53b3b7d;p=contrib%2FConifer.git Merge branch 'rel_2_4' of git.evergreen-ils.org:Evergreen into user/dbs/tpac_osul_2_4 --- 1fab95df0d7c0e04465994e1142fcb8eb53b3b7d