From: Yamil Suarez Date: Wed, 19 Oct 2011 15:42:42 +0000 (-0400) Subject: Merge remote-tracking branch 'upstream/master' X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=c14ce07ae2a01531a8ac1330cf0280111917ef6c;p=contrib%2FConifer.git Merge remote-tracking branch 'upstream/master' Conflicts: 1.6/admin/Upgrading-Evergreen_1.6.xml 1.6/admin/serversideinstallation.xml 2.0/admin/Upgrading-Evergreen-2.0.xml 2.0/admin/serversideinstallation_2.0.xml --- c14ce07ae2a01531a8ac1330cf0280111917ef6c