[Pkg-haskell-commits] [SCM] haskell-testpack branch, master, updated. debian/2.0.0-3-7-g774f15a

[Joachim Breitner]

The following commit has been merged in the master branch:
commit 42e04caf9c4fe3b65211e12600f0715aab80878d
Merge: 61170640789d6e962d4c8a601ed6ee3f09d1a91d 54ada2cbb15444ae251d2dbee5c4158d4b330102
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Thu Apr 21 14:32:59 2011 +0530

    Merge commit 'upstream/2.1.0'
    
    Conflicts:
    	src/Test/HUnit/Tools.hs


-- 
haskell-testpack