From: Jason Etheridge Date: Wed, 14 Sep 2011 14:58:31 +0000 (-0400) Subject: Merge branch 'rel_2_0' of git.evergreen-ils.org:Evergreen into rel_2_0 X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=e48918397425be84bed05d5143efe3459ea54272;p=contrib%2FConifer.git Merge branch 'rel_2_0' of git.evergreen-ils.org:Evergreen into rel_2_0 --- e48918397425be84bed05d5143efe3459ea54272