Merge branch 'rel_2_7_mergery_alt' of git.evergreen-ils.org:contrib/Conifer into...
authorDan Scott <dscott@laurentian.ca>
Wed, 17 Dec 2014 05:03:33 +0000 (00:03 -0500)
committerDan Scott <dscott@laurentian.ca>
Wed, 17 Dec 2014 05:03:33 +0000 (00:03 -0500)

Trivial merge