Merge branch 'master' of ops:nuevo-pilosa

This commit is contained in:
Todd Gruben 2014-01-28 18:02:39 -06:00
commit b341d75dd2

View file

@ -9,6 +9,11 @@
"version": "35c98e8c885757fab1824daa77cc0e24bf30e76b",
"type": "git"
},
"log": {
"repo": "github.com/coreos/go-log/log",
"version": "70d039bee4b0e389e5be560491d8291708506f59",
"type": "git"
},
"gkvlite": {
"repo": "github.com/steveyen/gkvlite",
"version": "master",