From: Angela Kilsdonk Date: Fri, 31 May 2013 20:04:45 +0000 (-0400) Subject: Merge branch 'rel_2_4' of git.evergreen-ils.org:Evergreen into rel_2_4 X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=cb5e2635ac2ebfdf7f6c7b23f5fbfded19214c0e;p=evergreen%2Fequinox.git Merge branch 'rel_2_4' of git.evergreen-ils.org:Evergreen into rel_2_4 --- cb5e2635ac2ebfdf7f6c7b23f5fbfded19214c0e