Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen
authorMichael Peters <mrpeters@library.in.gov>
Sun, 23 Dec 2012 22:15:01 +0000 (17:15 -0500)
committerMichael Peters <mrpeters@library.in.gov>
Sun, 23 Dec 2012 22:15:01 +0000 (17:15 -0500)
commita45e830f5190e0d7553b9983e1262223b33909d4
tree3b2c56646aa79425b42b562dad66b8ffa8a9600e
parent4997d114721bf000f4ddf47e617c0e506faa21d3
parentadc1e00adad32f1c3f9049b9417584b14aba3576
Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen