[commit: packages/containers] cleaned_bugfix394, master, merge-doc-target, merge-fixes-5.9, revert-408-bugfix_394: Merge branch 'refs/heads/master' into IntMapGeneralMerge (b1c36d0)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/containers

On branches: cleaned_bugfix394,master,merge-doc-target,merge-fixes-5.9,revert-408-bugfix_394
Link       : http://git.haskell.org/packages/containers.git/commitdiff/b1c36d0e0a6e83df68ceeca067cf74a77912d653

>---------------------------------------------------------------

commit b1c36d0e0a6e83df68ceeca067cf74a77912d653
Merge: 06e0146 1e6bb29
Author: wren romano <wren at community.haskell.org>
Date:   Sun Nov 6 17:15:00 2016 -0800

    Merge branch 'refs/heads/master' into IntMapGeneralMerge



>---------------------------------------------------------------

b1c36d0e0a6e83df68ceeca067cf74a77912d653
 Data/Map/Internal.hs        | 134 +++++++++++++++++++++++++++++++-------------
 Data/Map/Lazy.hs            |   4 +-
 Data/Map/Strict.hs          |   4 +-
 Data/Map/Strict/Internal.hs |   7 ++-
 Data/Sequence/Internal.hs   |  18 +++---
 Data/Set.hs                 |   2 +
 Data/Set/Internal.hs        |  82 ++++++++++++++++++++-------
 changelog.md                |   9 +++
 tests/map-properties.hs     |   8 +++
 tests/set-properties.hs     |   8 +++
 10 files changed, 206 insertions(+), 70 deletions(-)