From: Michael Peters Date: Sat, 19 Jan 2013 21:15:07 +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=52ef8f09b523167d300c98f0317f93fa4627b166;p=working%2FEvergreen.git Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen --- 52ef8f09b523167d300c98f0317f93fa4627b166