Merge branch 'pr/154' into release-candidates/rc-5.90116
authorJay Hannah <jay.hannah@iinteractive.com>
Tue, 16 Jan 2018 22:43:48 +0000 (16:43 -0600)
committerJay Hannah <jay.hannah@iinteractive.com>
Tue, 16 Jan 2018 22:43:48 +0000 (16:43 -0600)
commitdddc7ec8cc0e9112ff51caad562a15e3699e3fab
tree9008b715ec00d76304ee4724da05c960335cb73c
parent7060a5792b73efd8f5fdb6b9b7281d6394b5c5b6
parent8098d754062214cb2f951e06b3e5cec8b965b8d8
Merge branch 'pr/154' into release-candidates/rc-5.90116

Conflicts jhannah resolved manually:
  Makefile.PL
  lib/Catalyst.pm
Makefile.PL
lib/Catalyst.pm