Merge branch 'rel_2_7_mergery' of git.evergreen-ils.org:contrib/Conifer into rel_2_7_...
authorDan Scott <dscott@laurentian.ca>
Fri, 26 Dec 2014 13:46:32 +0000 (08:46 -0500)
committerDan Scott <dscott@laurentian.ca>
Fri, 26 Dec 2014 13:46:32 +0000 (08:46 -0500)

Trivial merge