Merge branch 'rel_2_4' of git.evergreen-ils.org:Evergreen into rel_2_4
authorAngela Kilsdonk <akilsdonk@esilibrary.com>
Fri, 31 May 2013 20:04:45 +0000 (16:04 -0400)
committerAngela Kilsdonk <akilsdonk@esilibrary.com>
Fri, 31 May 2013 20:04:45 +0000 (16:04 -0400)
commitcb5e2635ac2ebfdf7f6c7b23f5fbfded19214c0e
treec033895863b5f1a32bc4734f424601824ab2312e
parent6a71e043908277dc574619c00e1ee1d5e9c919d7
parent272e138b2231c94d5dfd474cf80cea9fcfb63279
Merge branch 'rel_2_4' of git.evergreen-ils.org:Evergreen into rel_2_4