Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
authorMichael Peters <mrpeters@library.in.gov>
Fri, 12 Oct 2012 20:15:05 +0000 (16:15 -0400)
committerMichael Peters <mrpeters@library.in.gov>
Fri, 12 Oct 2012 20:15:05 +0000 (16:15 -0400)
commitf04c5e727e0ec75415bc2eb8d2b7040ca5881667
treecf8d67d1bd915f53f7b1c03710df3e1d0cbd03f0
parente17c962ab6174b3bce3ba90b3be717cad7e1f900
parentcbf389d42138d18990539a6281be191d8dc6dee2
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen