Merge branch 'rel_2_7' of git.evergreen-ils.org:Evergreen into rel_2_7_mergery
authorDan Scott <dscott@laurentian.ca>
Fri, 26 Dec 2014 13:45:36 +0000 (08:45 -0500)
committerDan Scott <dscott@laurentian.ca>
Fri, 26 Dec 2014 13:45:36 +0000 (08:45 -0500)

Trivial merge