Merge branch 'master' of git.evergreen-ils.org:Evergreen into long-overdue long-overdue
authorBill Erickson <berick@esilibrary.com>
Tue, 23 Apr 2013 17:54:44 +0000 (13:54 -0400)
committerBill Erickson <berick@esilibrary.com>
Tue, 23 Apr 2013 17:54:44 +0000 (13:54 -0400)
commit6bfe279280ff7b5900ec0d2bcefa2f5bff68aece
treeffc21471c20bc832e7d4753aaa82544a2d1de913
parent4c264599a21f4567446a6bd9a6b8624c6fce4fc0
parent15de0f58f95ba3784d96d33443676ff9fed1ab24
Merge branch 'master' of git.evergreen-ils.org:Evergreen into long-overdue