[commit: packages/containers] changelog-foldtree, cleaned_bugfix394, develop, develop-0.6, develop-0.6-questionable, master, merge-doc-target, merge-fixes-5.9, merge-restrict-fix-5.8, revert-184-generic, revert-408-bugfix_394, zip-devel: Merge pull request #42 from k-bx/add-role-annotations-lang (0098d41)

[git at git.haskell.org]

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

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

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

commit 0098d41f0aa0460f96eb2251ac743bb7fa137a68
Merge: e787f05 cb08a7e
Author: Johan Tibell <johan.tibell at gmail.com>
Date:   Mon Apr 14 07:01:33 2014 +0100

    Merge pull request #42 from k-bx/add-role-annotations-lang
    
    Add LANGUAGE RoleAnnotations for ghc 7.8



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

0098d41f0aa0460f96eb2251ac743bb7fa137a68
 Data/Map/Base.hs | 3 +++
 Data/Set/Base.hs | 3 +++
 2 files changed, 6 insertions(+)