[commit: packages/containers] changelog-foldtree, cleaned_bugfix394, master, merge-doc-target, merge-fixes-5.9, merge-restrict-fix-5.8, revert-184-generic, revert-408-bugfix_394: Merge branch 'master' of github:haskell/containers (d0adc21)

[git at git.haskell.org]

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

On branches: changelog-foldtree,cleaned_bugfix394,master,merge-doc-target,merge-fixes-5.9,merge-restrict-fix-5.8,revert-184-generic,revert-408-bugfix_394
Link       : http://git.haskell.org/packages/containers.git/commitdiff/d0adc21f9ad9d64f6af92e46feade67404962516

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

commit d0adc21f9ad9d64f6af92e46feade67404962516
Merge: e9ec4c2 b263e4a
Author: Milan Straka <milan at strakovi.com>
Date:   Thu Feb 11 08:14:14 2016 +0100

    Merge branch 'master' of github:haskell/containers



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

d0adc21f9ad9d64f6af92e46feade67404962516
 Data/IntMap.hs     | 2 +-
 Data/Map/Strict.hs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)