[commit: packages/time] master, wip/travis: Merge pull request #11 from hvr/pr-deepseq14 (982ea8f)

[git at git.haskell.org]

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

On branches: master,wip/travis
Link       : http://git.haskell.org/packages/time.git/commitdiff/982ea8f68740a93399c78b0275d2a685d79c15cf

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

commit 982ea8f68740a93399c78b0275d2a685d79c15cf
Merge: b55b3c2 e6d887a
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Fri Nov 14 14:27:46 2014 -0800

    Merge pull request #11 from hvr/pr-deepseq14
    
    Add support for `deepseq-1.4.0.0`



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

982ea8f68740a93399c78b0275d2a685d79c15cf
 lib/Data/Time/Clock/Scale.hs | 3 ++-
 lib/Data/Time/Clock/UTC.hs   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)