Merge branch 'master' of github.com:jspm/registry

package-overrides/github/firebase/angularfire@0.9.0.json

@@ -0,0 +1,13 @@
+{
+  "directories": {
+    "lib": "dist"
+  },
+  "files": ["angularfire.js"],
+  "shim": {
+    "angularfire": ["firebase", "angular"]
+  },
+  "dependencies": {
+    "angular": "^1.3.2",
+    "firebase": "^2.0.4"
+  }
+}

package-overrides/github/firebase/firebase-bower@2.0.4.json

@@ -0,0 +1,4 @@
+{
+  "main": "firebase",
+  "registry": "jspm"
+}

registry.json

@@ -19,7 +19,9 @@
   "angular-ui-router-extras": "github:christopherthielen/ui-router-extras",
   "angular-ui-tree": "github:JimLiu/angular-ui-tree",
   "angular-sanitize": "github:angular/bower-angular-sanitize",
+  "firebase": "github:firebase/firebase-bower",
   "angularFire": "github:firebase/angularFire",
+  "angularfire": "github:firebase/angularfire",
   "backbone": "npm:backbone",
   "backbone.babysitter": "github:marionettejs/backbone.babysitter",
   "backbone.wreqr": "github:marionettejs/backbone.wreqr",