Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen
authorMichael Peters <mrpeters@library.in.gov>
Sun, 18 Nov 2012 18:15:07 +0000 (13:15 -0500)
committerMichael Peters <mrpeters@library.in.gov>
Sun, 18 Nov 2012 18:15:07 +0000 (13:15 -0500)
commitabbd785fc15f160c1103b9f48aa905df389a2fdb
tree1c968110dbe2859c3a54ea1bc3ef8380b1ca1053
parentfec923536ee35799a555243d7aafd13297da1cec
parent6aa8c2a0bb78e9bab518e5bfa85333d21890808e
Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen