[commit: packages/time] format-widths, ghc, master, tasty: Merge branch 'update' (cd5704b)

[git at git.haskell.org]

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

On branches: format-widths,ghc,master,tasty
Link       : http://git.haskell.org/packages/time.git/commitdiff/cd5704b01bd1ebdb2c6c5e1936244eba62c50914

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

commit cd5704b01bd1ebdb2c6c5e1936244eba62c50914
Merge: 880c2a2 b6098be
Author: Ashley Yakeley <ashley at yakeley.org>
Date:   Sun Dec 18 17:13:45 2016 -0800

    Merge branch 'update'



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

cd5704b01bd1ebdb2c6c5e1936244eba62c50914
 changelog.md | 3 +++
 1 file changed, 3 insertions(+)

diff --cc changelog.md
index f91b353,ee3cd48..1b9f91d
--- a/changelog.md
+++ b/changelog.md
@@@ -1,8 -1,8 +1,11 @@@
  # Change Log
  
 +## [1.8]
 +- Added RawTime
 +
+ ## [1.7.0.1]
+ - Fix bounds issue in .cabal file
+ 
  ## [1.7]
  - Data.Time.Clock.TAI: change LeapSecondTable to LeapSecondMap with Maybe type; remove parseTAIUTCDATFile