From: Bill Erickson Date: Mon, 9 Jan 2012 15:39:56 +0000 (-0500) Subject: Merge branch 'master' of git.evergreen-ils.org:Evergreen into collab/phasefx/sms_msgs X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=cb7126037c590809673faea2eb43328fecfecfc6;p=working%2FEvergreen.git Merge branch 'master' of git.evergreen-ils.org:Evergreen into collab/phasefx/sms_msgs --- cb7126037c590809673faea2eb43328fecfecfc6