Merge branch 'master' of github.com:haskell/time
authorAshley Yakeley <ashley@yakeley.org>
Sat, 13 May 2017 10:36:34 +0000 (03:36 -0700)
committerAshley Yakeley <ashley@yakeley.org>
Sat, 13 May 2017 10:36:34 +0000 (03:36 -0700)
commit953936893809bcd66761e14c76c2a653a77dfa58
tree995db363f47861cbeb41c68b1049dd88307e0e4b
parentc29513e6f79f6f8cefc69663c34e780570bef34a
parent699ab286eefc63148eef5c18294868e937b036d5
Merge branch 'master' of github.com:haskell/time