Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen
authorMichael Peters <mrpeters@library.in.gov>
Fri, 4 Jan 2013 21:15:02 +0000 (16:15 -0500)
committerMichael Peters <mrpeters@library.in.gov>
Fri, 4 Jan 2013 21:15:02 +0000 (16:15 -0500)
commit118503621981757952efba37ebbf1dfeb9be153e
treedee9d95b72f4864428e700f44e5d662dc5f17f00
parent6d13095295b804acb783320fea3b10bf699483f2
parent16c65efba41d5fd44bb0ee3f73ba485143a62ed5
Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen