Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
authorMichael Peters <mrpeters@library.in.gov>
Wed, 8 Aug 2012 16:15:05 +0000 (12:15 -0400)
committerMichael Peters <mrpeters@library.in.gov>
Wed, 8 Aug 2012 16:15:05 +0000 (12:15 -0400)
commitc88d2d50b0d84c48f57681796addc0769fcb336f
treee8eb571f7c8bf9fa68a330dbca5772d2a988d56a
parent16391451cefe55489f83d6d690464e20404a0ed5
parentf36156a19e3e0d04535a7ee839fa0e3a922f3d47
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen