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)

Trivial merge