Merge branch 'rel_2_7_mergery' of git.evergreen-ils.org:contrib/Conifer into rel_2_7_...
authorDan Scott <dscott@laurentian.ca>
Thu, 22 Jan 2015 18:59:58 +0000 (13:59 -0500)
committerDan Scott <dscott@laurentian.ca>
Thu, 22 Jan 2015 18:59:58 +0000 (13:59 -0500)

Trivial merge