Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
authorMichael Peters <mrpeters@library.in.gov>
Wed, 24 Oct 2012 04:15:07 +0000 (00:15 -0400)
committerMichael Peters <mrpeters@library.in.gov>
Wed, 24 Oct 2012 04:15:07 +0000 (00:15 -0400)
commitf8e91bda6d137eb3d065055c1fa82a0034a515d7
treef2d4126e881466f1e5fadf8fef1a3add11826b5d
parent9d7bf340d707677a3dd14ea9abc70164638f85b8
parent81f20bb285bdda845cf7ad4b54e974b85d33c8bb
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen