2 Commits

Author	SHA1	Message	Date
Michael Snoyman	2377d70ec8	Merge branch 'master' into yesod1.2 ... Conflicts: yesod-json/yesod-json.cabal	2013-03-10 09:49:28 +02:00
Michael Snoyman	ed53b20308	Merge yesod-json functionality into yesod-core (closes #487)	2013-02-12 15:42:45 +02:00