Merge branch 'rel_2_4_mergery' of git.evergreen-ils.org:contrib/Conifer into rel_2_4_...
authorDan Scott <dscott@laurentian.ca>
Tue, 25 Jun 2013 21:04:44 +0000 (17:04 -0400)
committerDan Scott <dscott@laurentian.ca>
Tue, 25 Jun 2013 21:04:44 +0000 (17:04 -0400)
commit5270c5233f7a96d9cdd5decc1c5f8142701972fd
treef849ecb659470cf7102b92a7c96f16995159fda0
parent3e43193d621babb621fcbf4fe9bd9011bca33497
parentc1e878888998f2a9dd4e588ed3e92f2c505eb7f3
Merge branch 'rel_2_4_mergery' of git.evergreen-ils.org:contrib/Conifer into rel_2_4_mergery_tpac