Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen
authorMichael Peters <mrpeters@library.in.gov>
Mon, 19 Nov 2012 21:15:06 +0000 (16:15 -0500)
committerMichael Peters <mrpeters@library.in.gov>
Mon, 19 Nov 2012 21:15:06 +0000 (16:15 -0500)
commitb0e87afef4b53bbf19de8c1baa31d5e61657027c
treee05bb5e5bfd57efad1158c7bc9625372604f62a6
parentabbd785fc15f160c1103b9f48aa905df389a2fdb
parent60c5146f4a4ce942329afcaba1c9df23e0ccd557
Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen