[commit: packages/time] master, wip/travis: Merge pull request #35 from bergmark/ghc70 (45c652b)

[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/45c652b0a88097bf00ab2e81625741ee3552a309

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

commit 45c652b0a88097bf00ab2e81625741ee3552a309
Merge: 882305f 603b058
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sun Aug 23 13:08:53 2015 -0700

    Merge pull request #35 from bergmark/ghc70
    
    Fix compilation on GHC 7.0 by not using Trustworthy



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

45c652b0a88097bf00ab2e81625741ee3552a309
 lib/Data/Time/Clock/CTimeval.hs     | 2 +-
 lib/Data/Time/Clock/Scale.hs        | 3 ++-
 lib/Data/Time/Clock/UTC.hs          | 3 ++-
 lib/Data/Time/LocalTime/TimeZone.hs | 2 +-
 time.cabal                          | 3 +--
 5 files changed, 7 insertions(+), 6 deletions(-)