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

Mon Apr 17 21:46:21 UTC 2017

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/4ebbf29ba195010a692e74ab00f467cd5610465a

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

commit 4ebbf29ba195010a692e74ab00f467cd5610465a
Merge: f6ceb8c 8b21238
Author: wren romano <wren at community.haskell.org>
Date:   Sun Dec 11 14:19:44 2016 -0800

    Merge branch 'master' into IntMapGeneralMerge


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

4ebbf29ba195010a692e74ab00f467cd5610465a