From: Bill Erickson Date: Fri, 8 Jan 2016 16:11:40 +0000 (-0500) Subject: Merge branch 'master' of git.evergreen-ils.org:Evergreen into collab/berick/lp1468422... X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=17bea2cf56d4cce89fbfec7d2352f628b5dd33ff;p=working%2FEvergreen.git Merge branch 'master' of git.evergreen-ils.org:Evergreen into collab/berick/lp1468422-passwd-storage --- 17bea2cf56d4cce89fbfec7d2352f628b5dd33ff