[commit: packages/time] ghc-head: Merge tag '1_4_2' of http://code.haskell.org/time/ into ghc-head (adafac2)

[git at git.haskell.org]

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

On branch  : ghc-head
Link       : http://git.haskell.org/packages/time.git/commitdiff/adafac26307cffab0be20c126385ab161c259237

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

commit adafac26307cffab0be20c126385ab161c259237
Merge: d4f019b db383ba
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Mon Mar 3 09:19:20 2014 +0100

    Merge tag '1_4_2' of http://code.haskell.org/time/ into ghc-head



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

adafac26307cffab0be20c126385ab161c259237
 Data/Time/Clock/CTimeval.hs     |    2 +-
 Data/Time/Clock/Scale.hs        |    1 +
 Data/Time/Clock/UTC.hs          |    1 +
 Data/Time/LocalTime/TimeZone.hs |    2 +-
 Makefile                        |   11 +++++++----
 time.cabal                      |    4 ++--
 6 files changed, 13 insertions(+), 8 deletions(-)