Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
authorMichael Peters <mrpeters@library.in.gov>
Wed, 2 Jan 2013 22:15:06 +0000 (17:15 -0500)
committerMichael Peters <mrpeters@library.in.gov>
Wed, 2 Jan 2013 22:15:06 +0000 (17:15 -0500)
commit95d70142f7816c8ae9161233b60f5c3c1e13ff9f
tree103d00876cf8fb95844951a505acdb3caca4b87f
parent6378546d86df5ac99fbb423c6ee2be00340246af
parent0cdae03f4029b3a66bda80f7d94fd3072c305db1
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen