Merge branch 'rel_2_7_mergery' of git.evergreen-ils.org:contrib/Conifer into rel_2_7_...
authorDan Scott <dscott@laurentian.ca>
Sun, 7 Dec 2014 14:08:49 +0000 (09:08 -0500)
committerDan Scott <dscott@laurentian.ca>
Sun, 7 Dec 2014 14:08:49 +0000 (09:08 -0500)

Trivial merge