Merge branch 'master' of git://github.com/dereuromark/cakephp-tools

Author: Mark Scherer

composer.json

@@ -15,7 +15,7 @@
 	"require": {
 		"php": ">=5.3",
 		"composer/installers": "*",
-		"dereuromark/cakephp-shim": "dev-master"
+		"dereuromark/cakephp-shim": "0.1.*"
 	},
 	"support": {
 		"source": "https://github.com/dereuromark/cakephp-tools"