[commit: packages/time] format-widths: Merge branch 'master' into format-widths (7767c80)

[git at git.haskell.org]

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

On branch  : format-widths
Link       : http://git.haskell.org/packages/time.git/commitdiff/7767c804ee38fcc6645c2b5c4445e7377876606d

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

commit 7767c804ee38fcc6645c2b5c4445e7377876606d
Merge: 80ee35c d7ed24e
Author: Ashley Yakeley <ashley at yakeley.org>
Date:   Tue Feb 7 19:33:24 2017 -0800

    Merge branch 'master' into format-widths



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

7767c804ee38fcc6645c2b5c4445e7377876606d
 changelog.md | 2 ++
 1 file changed, 2 insertions(+)

diff --cc changelog.md
index 3e03aca,d4f6b2e..e8ac39f
--- a/changelog.md
+++ b/changelog.md
@@@ -2,7 -2,8 +2,9 @@@
  
  ## [1.8]
  - Added SystemTime
 +- Data.Time.Format: allow padding widths in specifiers for formatting (but not parsing)
+ - Test: use tasty, general clean-up
+ - Test: separate out UNIX-specific tests, so the others can be run on Windows
  
  ## [1.7.0.1]
  - Fix bounds issue in .cabal file