Merge branch 'rel_2_4' of git.evergreen-ils.org:Evergreen into rel_2_4
authorAngela Kilsdonk <akilsdonk@esilibrary.com>
Fri, 9 Aug 2013 15:24:06 +0000 (11:24 -0400)
committerAngela Kilsdonk <akilsdonk@esilibrary.com>
Fri, 9 Aug 2013 15:24:06 +0000 (11:24 -0400)
commit06f89fb208a22be29deeae99f7fcc0e824be97d7
treef9a023efe19e3c1c5ce6bc092def0453093195c8
parent3ed0711fb276d2a1c5a9a84fae062cfd0ae8f0eb
parentb895fdf27a2a0e9f621f7f96a05a30ceb78cb5b2
Merge branch 'rel_2_4' of git.evergreen-ils.org:Evergreen into rel_2_4