Merge branch 'rel_2_12' of git://git.evergreen-ils.org/Evergreen into rel_2_12_merger...
authorDan Scott <dscott@laurentian.ca>
Tue, 18 Jul 2017 00:13:46 +0000 (20:13 -0400)
committerDan Scott <dscott@laurentian.ca>
Tue, 18 Jul 2017 00:13:46 +0000 (20:13 -0400)

Trivial merge