{
	"name": "typo3/fluid",
	"type": "typo3-flow-framework",
	"description": "Next-Generation Templating Framework for Flow and Neos",
	"license": ["MIT"],
	"require": {
		"typo3/flow": "~3.3.0"
	},
	"autoload": {
		"psr-0": {
			"TYPO3\\Fluid": "Classes"
		}
	}
}

{
	"name": "typo3/fluid",
	"type": "typo3-flow-framework",
	"description": "Next-Generation Templating Framework for Flow and Neos",
	"license": ["MIT"],
	"require": {
		"typo3/flow": "*"
	},
	"autoload": {
		"psr-0": {
			"TYPO3\\Fluid": "Classes"
		}
	}
}

Fix version constraints/numbers from merge accident
BUGFIX: Fix version constraints/numbers from merge accident

A merge into master that was done with too little cleanup changed the branch
and version numbers in a few places where they should have been left
unchanged.

Also some changelog files were added that are not supposed to be in master.
