Sönke Hahn 33cc9958ed Merge remote-tracking branch 'origin/master' into shahn/config ... Conflicts: servant-server/test/Servant/ServerSpec.hs		2016-01-09 13:00:42 +01:00
..
Servant	Merge remote-tracking branch 'origin/master' into shahn/config	2016-01-09 13:00:42 +01: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