Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen
authorMichael Peters <mrpeters@library.in.gov>
Wed, 16 Jan 2013 18:15:02 +0000 (13:15 -0500)
committerMichael Peters <mrpeters@library.in.gov>
Wed, 16 Jan 2013 18:15:02 +0000 (13:15 -0500)
commitedc4a296256897e8d2642f9c253fd926af874016
tree0af74e1bf8c1a9d9be32972a6081018e28566171
parente0244fe8a0e4454bbb630c39faec3f11bf4590a2
parentfb9a80bdf082963df053705a0af0bc7585be9979
Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen