[commit: packages/containers] cleaned_bugfix394, master, merge-doc-target, merge-fixes-5.9, revert-408-bugfix_394: Merge pull request #358 from wrengr/IntMapGeneralMerge (8b21238)

[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/8b21238136403506c1c3ed1f6bdbb319ad5c3f80

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

commit 8b21238136403506c1c3ed1f6bdbb319ad5c3f80
Merge: 1e6bb29 86a50ab
Author: wren romano <wren at community.haskell.org>
Date:   Sun Dec 11 14:02:45 2016 -0800

    Merge pull request #358 from wrengr/IntMapGeneralMerge
    
    IntMap general merge



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

8b21238136403506c1c3ed1f6bdbb319ad5c3f80
 Data/IntMap/Internal.hs | 1152 ++++++++++++++++++++++++++++++++++++++---------
 Data/Map/Internal.hs    |   28 +-
 2 files changed, 965 insertions(+), 215 deletions(-)