Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen
authorMichael Peters <mrpeters@library.in.gov>
Thu, 29 Nov 2012 22:15:01 +0000 (17:15 -0500)
committerMichael Peters <mrpeters@library.in.gov>
Thu, 29 Nov 2012 22:15:01 +0000 (17:15 -0500)
commit54703bda1272c1f9e5a0e7ef3c05313451e87bff
tree59a3f689e85679f778c8bc31d86665ad805fd39a
parent0e48d286edd23bdda373ceea704ddf48f34300da
parent6c71f0264e598fa73648de12f5ff51a678b6fc00
Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen