[commit: packages/containers] cleaned_bugfix394, master, merge-doc-target, merge-fixes-5.9, revert-408-bugfix_394: Merge pull request #360 from erikd/master (30b0fe7)

[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/30b0fe71f52657ff360b577521dbd67a2051c37f

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

commit 30b0fe71f52657ff360b577521dbd67a2051c37f
Merge: 4dab9e9 0491f23
Author: David Feuer <David.Feuer at gmail.com>
Date:   Thu Dec 15 00:33:08 2016 -0500

    Merge pull request #360 from erikd/master
    
    Data.Map.Internal: Fix CPP usage



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

30b0fe71f52657ff360b577521dbd67a2051c37f
 Data/Map/Internal.hs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)