Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen
authorMichael Peters <mrpeters@library.in.gov>
Wed, 10 Oct 2012 20:15:06 +0000 (16:15 -0400)
committerMichael Peters <mrpeters@library.in.gov>
Wed, 10 Oct 2012 20:15:06 +0000 (16:15 -0400)
commit85634a0fce82efdab14b63696cea835a40738690
treeb7ace1a96082e78fed5b51093e01242147ea6087
parent91a1e6b436386a36be1d2011d91536c57e089ecb
parentd933e14655786b760dd187ae7b167cc5d7a3194c
Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen