[commit: packages/bytestring] master: Merge pull request #34 from hvr/pr-deepseq-14 (7a7602a)

[git at git.haskell.org]

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

On branch  : master
Link       : http://git.haskell.org/packages/bytestring.git/commitdiff/7a7602a142a1deae2e4f73782d88a91f39a0fa98

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

commit 7a7602a142a1deae2e4f73782d88a91f39a0fa98
Merge: 27d597b 30e135c
Author: Duncan Coutts <duncan at community.haskell.org>
Date:   Fri Nov 14 16:43:53 2014 +0000

    Merge pull request #34 from hvr/pr-deepseq-14
    
    Add support for `deepseq-1.4.0.0`



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

7a7602a142a1deae2e4f73782d88a91f39a0fa98
 Data/ByteString/Internal.hs       | 5 +++--
 Data/ByteString/Short/Internal.hs | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)