Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen
authorMichael Peters <mrpeters@library.in.gov>
Fri, 12 Oct 2012 00:15:06 +0000 (20:15 -0400)
committerMichael Peters <mrpeters@library.in.gov>
Fri, 12 Oct 2012 00:15:06 +0000 (20:15 -0400)
commite17c962ab6174b3bce3ba90b3be717cad7e1f900
tree9f1475d80e083951e56ebbfe8827ae36ebf041d0
parentaa98feb51f6309f96f8736a5c999faa6becf1f2a
parente8dcb2de62179fc924b340ba3230ce5bd4092c42
Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen