Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
authorMichael Peters <mrpeters@library.in.gov>
Mon, 10 Dec 2012 19:15:07 +0000 (14:15 -0500)
committerMichael Peters <mrpeters@library.in.gov>
Mon, 10 Dec 2012 19:15:07 +0000 (14:15 -0500)
commitb6c12728ca02752549718ff3eded98e753d7002b
tree5d515e182e6ccc1c3f3c72caa4eaff2730a45999
parent3802708174bb6be5276caea6cd6250a2e896a01e
parent5bc693977b1fa85e23551a73551c231a3fe16cd1
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen