[Checkins] [zopefoundation/grokcore.annotation] 79b601: Fix merge from master.

[GitHub]

  Branch: refs/heads/lazy-annotation
  Home:   https://github.com/zopefoundation/grokcore.annotation
  Commit: 79b6015525fc3d80d4fbd5d94f0a20f1e935c6af
      https://github.com/zopefoundation/grokcore.annotation/commit/79b6015525fc3d80d4fbd5d94f0a20f1e935c6af
  Author: Michael Howitz <mh at gocept.com>
  Date:   2017-05-26 (Fri, 26 May 2017)

  Changed paths:
    M setup.py

  Log Message:
  -----------
  Fix merge from master.