Merge branch 'master' of git://git.evergreen-ils.org/Evergreen into hard_dates
authorMichele Morgan <mmorgan@noblenet.org>
Mon, 1 May 2017 21:03:41 +0000 (17:03 -0400)
committerMichele Morgan <mmorgan@noblenet.org>
Mon, 1 May 2017 21:03:41 +0000 (17:03 -0400)

Trivial merge