[commit: packages/time] master, wip/travis: Merge pull request #26 from gbaz/instances (80a554c)

[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/80a554c39ae8b99b46a0f64c63a43cf359a8fc09

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

commit 80a554c39ae8b99b46a0f64c63a43cf359a8fc09
Merge: 5b4f363 76bd850
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sat May 30 20:48:57 2015 -0700

    Merge pull request #26 from gbaz/instances
    
    Ensure Read/Show instances are always provided with UTCTime and Universa...



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

80a554c39ae8b99b46a0f64c63a43cf359a8fc09
 lib/Data/Time/Calendar.hs            |  1 +
 lib/Data/Time/Calendar/Days.hs       |  3 ---
 lib/Data/Time/Clock.hs               |  9 +++------
 lib/Data/Time/Clock/POSIX.hs         |  6 +++++-
 lib/Data/Time/Clock/Scale.hs         |  6 ------
 lib/Data/Time/Clock/UTC.hs           |  6 ------
 lib/Data/Time/Format.hs              | 11 ++++++++---
 lib/Data/Time/Format/Locale.hs       |  3 ++-
 lib/Data/Time/Format/Parse.hs        | 11 +++++++----
 lib/Data/Time/LocalTime.hs           |  1 +
 lib/Data/Time/LocalTime/LocalTime.hs | 16 ++++++++--------
 lib/Data/Time/LocalTime/TimeOfDay.hs |  5 +----
 lib/Data/Time/LocalTime/TimeZone.hs  |  5 +----
 13 files changed, 37 insertions(+), 46 deletions(-)