[commit: packages/time] ghc, master: Merge pull request #73 from bgamari/master (699ab28)

[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/699ab286eefc63148eef5c18294868e937b036d5

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

commit 699ab286eefc63148eef5c18294868e937b036d5
Merge: fbf90b6 05776df
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sun Apr 30 22:53:26 2017 -0700

    Merge pull request #73 from bgamari/master
    
    Fix #ifdef



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

699ab286eefc63148eef5c18294868e937b036d5