Merge branch 'master' of git.evergreen-ils.org:Evergreen into ff-as-eg-branch-ui
authorBill Erickson <berick@esilibrary.com>
Wed, 13 Nov 2013 13:52:44 +0000 (08:52 -0500)
committerBill Erickson <berick@esilibrary.com>
Wed, 13 Nov 2013 13:52:44 +0000 (08:52 -0500)
commit7e766c84acf26f34521cc8e64c00ed4a7bd97335
tree013154890a61aa4f75475731504dd7b7a7a8e710
parentb2d0272bd2db253f4bc9d7ec204a1090b2aa2086
parent4da378fda14446fa279f693d758eef7e5597b1e2
Merge branch 'master' of git.evergreen-ils.org:Evergreen into ff-as-eg-branch-ui