From: Michael Peters Date: Mon, 22 Oct 2012 17:15:02 +0000 (-0400) Subject: Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=b938c54ae34c1899008884b42ae3f292f6c8ee27;p=working%2FEvergreen.git Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen --- b938c54ae34c1899008884b42ae3f292f6c8ee27