Merge branch 'master' into develop

2013-05-31 08:29:42 -05:00
parent 164e2d9651 d1520dc1b9
commit 5e24837f43
2 changed files with 4 additions and 1 deletions
--- a/composer.json
+++ b/composer.json
@@ -1,4 +1,7 @@
 {
+    "name": "laravel/framework",
+    "description": "The Laravel Framework.",
+    "keywords": ["framework", "laravel"],
 	"require": {
 		"laravel/framework": "4.1.*"
 	},