From: Dan Scott <dscott@laurentian.ca>
Date: Thu, 29 Dec 2011 17:47:37 +0000 (-0500)
Subject: Merge branch 'rel_2_0' of git.evergreen-ils.org:/Evergreen into new_rel20
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=5368270644e6a229f0f62f924d488c937398f024;p=contrib%2FConifer.git

Merge branch 'rel_2_0' of git.evergreen-ils.org:/Evergreen into new_rel20

Conflicts:
	README

Signed-off-by: Dan Scott <dscott@laurentian.ca>
---

5368270644e6a229f0f62f924d488c937398f024