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

[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/342423dd60f42b448e2c10027e3e0478135f697a

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

commit 342423dd60f42b448e2c10027e3e0478135f697a
Merge: 8b21238 4ebbf29
Author: wren romano <wren at community.haskell.org>
Date:   Sun Dec 11 14:21:34 2016 -0800

    Merge pull request #362 from wrengr/IntMapGeneralMerge
    
    Int map general merge



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

342423dd60f42b448e2c10027e3e0478135f697a
 Data/IntMap/Internal.hs | 36 +++++++++++++++++++++++++++++++++++-
 Data/Map/Internal.hs    |  0
 2 files changed, 35 insertions(+), 1 deletion(-)