Merge branch 'master' of git.evergreen-ils.org:Evergreen into kpac
authorBill Erickson <berick@esilibrary.com>
Tue, 10 Apr 2012 14:12:55 +0000 (10:12 -0400)
committerBill Erickson <berick@esilibrary.com>
Tue, 10 Apr 2012 14:12:55 +0000 (10:12 -0400)
commitc893a2decccda35415517da25a853ebac776c276
tree57ed431927f9a89d63fafe1432f4d16ed79a6fe9
parent359b238efab7ae6e9bcdfd6328ce49e5cac6e8d2
parentd4e4cb6526ca383844a2c09c85341082780d5d02
Merge branch 'master' of git.evergreen-ils.org:Evergreen into kpac