From: Michael Peters Date: Wed, 16 Jan 2013 18: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=edc4a296256897e8d2642f9c253fd926af874016;p=working%2FEvergreen.git Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen --- edc4a296256897e8d2642f9c253fd926af874016