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)

Trivial merge