merged conflicts

diff --cc Changes
index d9a5fd7,708e433..822e1c8
--- 1/Changes
--- 2/Changes
+++ b/Changes
@@@ -1,10 -1,14 +1,18 @@@
  # This file documents the revision history for Perl extension Catalyst.
  
 -5.90099_001 - TBA
 +5.90094 - 2015-07-24
 +  - When there is a multipart POST request and the parts have extended
 +    HTTP headers, try harder to decode and squeeze a meaningful value
 +    out of it before giving up and crying.  Updated docs and tests to
 +    reflect this change.
++  - Fixed issue where last_error actually returned the first error.  Took
++    the change to add a 'pop_errors' to give the inverse of shift_errors.
+   - Merged Pull Requests:
+     - https://github.com/perl-catalyst/catalyst-runtime/pull/95
+     - https://github.com/perl-catalyst/catalyst-runtime/pull/96
+     - https://github.com/perl-catalyst/catalyst-runtime/pull/97
+     - https://github.com/perl-catalyst/catalyst-runtime/pull/98
+     - https://github.com/perl-catalyst/catalyst-runtime/pull/106
 -  - Fixed issue where last_error actually returned the first error.  Took
 -    the change to add a 'pop_errors' to give the inverse of shift_errors.
  
  5.90093 - 2015-05-29
    - Fixed a bug where if you used $res->write and then $res->body, the

diff --cc lib/Catalyst.pm
Simple merge