Merge branch 'master' of git.evergreen-ils.org:Evergreen into user/berick/lp1452950...
authorBill Erickson <berickxx@gmail.com>
Tue, 19 May 2015 12:38:18 +0000 (08:38 -0400)
committerBill Erickson <berickxx@gmail.com>
Tue, 19 May 2015 12:38:18 +0000 (08:38 -0400)
commit7db2c28bc40afc30b25db7b8e4c83d84383ce32a
tree9b3052ded43012b5113f47c641831a305a13850a
parentb46d3ee90c202a5b5507ef31da9d19c8778460e0
parent9d88f6289a261cd3dae9f68aa54e62afd6289948
Merge branch 'master' of git.evergreen-ils.org:Evergreen into user/berick/lp1452950-web-client-patron-reg-wip