Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
authorMichael Peters <mrpeters@library.in.gov>
Thu, 20 Dec 2012 22:15:06 +0000 (17:15 -0500)
committerMichael Peters <mrpeters@library.in.gov>
Thu, 20 Dec 2012 22:15:06 +0000 (17:15 -0500)
commitcca758b656f7df71d048e1039b7c210acb7cae54
treeed2f157a4365bee03a14141227006978eaa1cd5a
parentd4bb06efe472f428da5a11a0b4eb0d739e3cdc16
parent9f97cd102c179a194a856a69a51f55e84e71144d
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen