[commit: packages/time] ghc, master: Merge pull request #63 from bgamari/master (4eb06c0)

[git at git.haskell.org]

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

On branches: ghc,master
Link       : http://git.haskell.org/packages/time.git/commitdiff/4eb06c0e5381a5b5ad2186ac6ecff434cd711376

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

commit 4eb06c0e5381a5b5ad2186ac6ecff434cd711376
Merge: 098d907 c951971
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Tue Feb 21 15:33:20 2017 -0800

    Merge pull request #63 from bgamari/master
    
    Merge orphan commit into branch 'upstream/master'



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

4eb06c0e5381a5b5ad2186ac6ecff434cd711376