Alex Mason 5c62f5a24f Merge branch 'master' into servant-dates-new ... # Conflicts: # servant/CHANGELOG.md		2016-09-07 10:07:45 +10:00
..
Servant	Merge branch 'master' into servant-dates-new	2016-09-07 10:07:45 +10:00
Doctests.hs	less OverlappingInstances noise	2016-01-04 13:09:11 -05:00
Spec.hs	Prepare merge	2015-04-20 11:13:18 +02:00