Subject: [quicwg/base-drafts] f5dd59: Merge branch 'dont_reset_me' into http_extensions

From: Mike Bishop <[email-masked]>
Date: Mon, 06 Mar 2017 17:43:49 -0800

Branch: refs/heads/http_extensions
  Home:   https://github.com/quicwg/base-drafts
  Commit: f5dd59c9836fc79e7e572ec0463c4dc234e1747d
      https://github.com/quicwg/base-drafts/commit/f5dd59c9836fc79e7e572ec0463c4dc234e1747d
  Author: Mike Bishop <[email-masked]>
  Date:   2017-03-06 (Mon, 06 Mar 2017)

  Changed paths:
    M draft-ietf-quic-http.md

  Log Message:
  -----------
  Merge branch 'dont_reset_me' into http_extensions

  Commit: 87397545b4f0e83e05ed36830e07d629c657aca4
      https://github.com/quicwg/base-drafts/commit/87397545b4f0e83e05ed36830e07d629c657aca4
  Author: Mike Bishop <[email-masked]>
  Date:   2017-03-06 (Mon, 06 Mar 2017)

  Changed paths:
    M draft-ietf-quic-http.md

  Log Message:
  -----------
  Move content to HTTP/2 Considerations section, discuss extensions

  Commit: 562b83e618028dd0399534ab44ef52d5e68bf9c2
      https://github.com/quicwg/base-drafts/commit/562b83e618028dd0399534ab44ef52d5e68bf9c2
  Author: Mike Bishop <[email-masked]>
  Date:   2017-03-06 (Mon, 06 Mar 2017)

  Changed paths:
    M CONTRIBUTING.md
    M Makefile
    M draft-ietf-quic-recovery.md

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into http_extensions

  Commit: 12bcab7b759d00d2a6a6c11debaa2ab513255be2
      https://github.com/quicwg/base-drafts/commit/12bcab7b759d00d2a6a6c11debaa2ab513255be2
  Author: Mike Bishop <[email-masked]>
  Date:   2017-03-06 (Mon, 06 Mar 2017)

  Changed paths:
    M draft-ietf-quic-http.md

  Log Message:
  -----------
  Add IANA Error section

Compare: https://github.com/quicwg/base-drafts/compare/f5dd59c9836f^...12bcab7b759d