Merge branch 'rel_2_4_mergery' of git.evergreen-ils.org:contrib/Conifer into rel_2_4_...
authorDan Scott <dscott@laurentian.ca>
Tue, 4 Jun 2013 18:25:55 +0000 (14:25 -0400)
committerDan Scott <dscott@laurentian.ca>
Tue, 4 Jun 2013 18:25:55 +0000 (14:25 -0400)
commit459a4a244947a2ea4e8229e10ec5fb67a907e3eb
tree85b5e17c2e3afd894241cf21955c363b9d272b76
parentcdbf1e662f295d13ed932bcdd676a528016c6f76
parentad7a079e56929911ffe788291c406bf91aa5230b
Merge branch 'rel_2_4_mergery' of git.evergreen-ils.org:contrib/Conifer into rel_2_4_mergery_tpac