Merge branch 'master' of git://git.evergreen-ils.org/Evergreen into working_branch
authorJim Keenan <jkeenan@cwmars.org>
Wed, 15 Jun 2016 18:25:06 +0000 (14:25 -0400)
committerJim Keenan <jkeenan@cwmars.org>
Wed, 15 Jun 2016 18:25:06 +0000 (14:25 -0400)
commitec16c1d48b928f0a0a8b98f95838620befca469c
tree764ef0d82843b2e8c0c320ccba4c59aa19607a8a
parentdcefafb4bf28123eec6e640cfc959375ee725395
parentedaee081c0d7eaff3bc907f24129358d9e830439
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen into working_branch
Catching my local working_branch up to current