From: Michael Peters Date: Wed, 14 Nov 2012 20:15:02 +0000 (-0500) 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=fec923536ee35799a555243d7aafd13297da1cec;p=working%2FEvergreen.git Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen --- fec923536ee35799a555243d7aafd13297da1cec