Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen
authorMichael Peters <mrpeters@library.in.gov>
Fri, 11 Jan 2013 19:15:08 +0000 (14:15 -0500)
committerMichael Peters <mrpeters@library.in.gov>
Fri, 11 Jan 2013 19:15:08 +0000 (14:15 -0500)
commitb8438587583de107601aa35164d55a2722a860c7
treeb81f123b5801a2ef5d70042ee2d3903d0fb5eb82
parentb7f22547a84acef62be22748f4fa004fb618077f
parent2fee9f9693b382c999a62be75604d0bc2752fe0e
Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen