From: Michael Peters Date: Thu, 20 Dec 2012 00:15:01 +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=1c34da233df01bbd7bce34978ee0535c35bd91d1;p=working%2FEvergreen.git Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen --- 1c34da233df01bbd7bce34978ee0535c35bd91d1