Merge branch 'rel_2_7_mergery_tpac' of git.evergreen-ils.org:contrib/Conifer into...
authorDan Scott <dscott@laurentian.ca>
Fri, 19 Dec 2014 17:03:36 +0000 (12:03 -0500)
committerDan Scott <dscott@laurentian.ca>
Fri, 19 Dec 2014 17:03:36 +0000 (12:03 -0500)
commit1e4989caf65d151cd19cf66f730e05d9cd29c948
treed7a0c8fb4c819ea2c6abb429680ecbd14140b349
parentc157fcf7883916f4993cec9102a00fe166e7d6e9
parent959ba555d09bbec0871de7b158c51c12abd34014
Merge branch 'rel_2_7_mergery_tpac' of git.evergreen-ils.org:contrib/Conifer into rel_2_7_mergery_tpac