Alberto Valverde 12a2d2de2b Merge branch 'master' of https://github.com/prowdsponsor/esqueleto ... Conflicts: esqueleto.cabal		2015-04-01 16:32:26 +02:00
..
Test.hs	Merge branch 'master' of https://github.com/prowdsponsor/esqueleto	2015-04-01 16:32:26 +02:00