Merge remote-tracking branch 'global/master'

2014-11-27 14:07:05 -05:00
parent 0fa9adbd96 be5b6a643d
commit e63dacecb9
366 changed files with 10528 additions and 31 deletions
@@ -18,7 +18,7 @@
      "name": "Dmitry Romanenko",
      "twitter": "dimon222",
      "koding": "dimon222",
-      "location": "Toronto, CA",
+      "location": "Toronto, CA"
    }
  ]
 }