Merge branch 'rel_2_4_mergery' of git.evergreen-ils.org:contrib/Conifer into rel_2_4_...
authorDan Scott <dscott@laurentian.ca>
Mon, 24 Jun 2013 14:22:43 +0000 (10:22 -0400)
committerDan Scott <dscott@laurentian.ca>
Mon, 24 Jun 2013 14:22:43 +0000 (10:22 -0400)
commit3e43193d621babb621fcbf4fe9bd9011bca33497
treeb1e4738c7074aa36e4ce973ab12e059d1ff9de0a
parent196284f19847b12f8ec61e32fa92f4057020b8b7
parentff8237d228e0dd45c65409e117c9a03047a6b4cc
Merge branch 'rel_2_4_mergery' of git.evergreen-ils.org:contrib/Conifer into rel_2_4_mergery_tpac