Merge branch 'rel_2_2' of git.evergreen-ils.org:Evergreen into kcls-test/rel_2_2...
authorBill Erickson <berick@esilibrary.com>
Tue, 12 Jun 2012 19:35:51 +0000 (15:35 -0400)
committerBill Erickson <berick@esilibrary.com>
Tue, 12 Jun 2012 19:35:51 +0000 (15:35 -0400)
commitf8ec391f12c2799c784a0cac56526f4f225a2eb5
treeb1782bb48b830fe5adda02f2c007cda756cdffdc
parent9470434155d496e7b90d05f7e680979ade7fb4a4
parent6689a84cce89f60cbac8d0cc55be018043c0da5f
Merge branch 'rel_2_2' of git.evergreen-ils.org:Evergreen into kcls-test/rel_2_2/tpac