Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen
authorMichael Peters <mrpeters@library.in.gov>
Wed, 31 Oct 2012 16:15:01 +0000 (12:15 -0400)
committerMichael Peters <mrpeters@library.in.gov>
Wed, 31 Oct 2012 16:15:01 +0000 (12:15 -0400)
commit3fa83163941412f1b67e1b4b69fb1a753d3cbd82
tree820d48b59e4d7e5607433f508c6a8c03ae3b45f1
parentdb9655c1a9c2517d3d232ccd2526820102a55248
parent769a42183480e0ac3e7944816c89f7539660abd0
Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen