Merge branch 'rel_2_7' of git.evergreen-ils.org:Evergreen into feature/tpac_osul_2_7
authorDan Scott <dscott@laurentian.ca>
Wed, 17 Dec 2014 21:38:23 +0000 (16:38 -0500)
committerDan Scott <dscott@laurentian.ca>
Wed, 17 Dec 2014 21:38:23 +0000 (16:38 -0500)

Trivial merge