From: Peter Lux Date: Fri, 9 Dec 2011 21:13:58 +0000 (-0500) Subject: Merge branch 'master' of git://git.evergreen-ils.org/Evergreen into working_plux X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=5c507e26734223812342f6fa61c1f8b56ed403f4;p=working%2FEvergreen.git Merge branch 'master' of git://git.evergreen-ils.org/Evergreen into working_plux --- 5c507e26734223812342f6fa61c1f8b56ed403f4