From: Mike Rylander Date: Tue, 10 Jan 2012 20:11:07 +0000 (-0500) Subject: Merge branch 'master' of git.evergreen-ils.org:Evergreen X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=3cc27e764c9697e878ac9e0bff0db898f54e15b6;p=contrib%2FConifer.git Merge branch 'master' of git.evergreen-ils.org:Evergreen --- 3cc27e764c9697e878ac9e0bff0db898f54e15b6