Merge branch 'rel_2_7_mergery' of git.evergreen-ils.org:contrib/Conifer into rel_2_7_...
authorDan Scott <dscott@laurentian.ca>
Wed, 15 Apr 2015 16:14:35 +0000 (12:14 -0400)
committerDan Scott <dscott@laurentian.ca>
Wed, 15 Apr 2015 16:14:35 +0000 (12:14 -0400)

Trivial merge