Merge branch 'master' of git.evergreen-ils.org:Evergreen into web-staff-proto
authorBill Erickson <berick@esilibrary.com>
Fri, 11 Apr 2014 17:13:34 +0000 (13:13 -0400)
committerBill Erickson <berick@esilibrary.com>
Fri, 11 Apr 2014 17:13:34 +0000 (13:13 -0400)
commit86a0aa19c1903d8a84d1423146c02d0cd91d17b6
tree0a5e7be00270b87964a28f582600ea2a0ef2fab4
parentf064a80ba5a557ce353d74b1198a0418d70c35ae
parentf1fa38c29611f0e84d343d1543c3602cf6799b2b
Merge branch 'master' of git.evergreen-ils.org:Evergreen into web-staff-proto