Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
authorMichael Peters <mrpeters@library.in.gov>
Wed, 1 Aug 2012 19:15:05 +0000 (15:15 -0400)
committerMichael Peters <mrpeters@library.in.gov>
Wed, 1 Aug 2012 19:15:05 +0000 (15:15 -0400)
commitdef1068435b297e21b03f3415038572f2b02d0e1
treea30dc408e96c8b1f4889512317096f44e9bf08e6
parent138e01e57c8c08c6343916eb1ea95be51b537942
parent460d34e561fbeb9e9c878fb2f7faa45b260ee9a3
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen