merge master

This commit is contained in:
Vladimir Agafonkin
2013-06-11 17:04:49 +03:00
147 changed files with 11294 additions and 6606 deletions

5
.gitignore vendored
View File

@ -8,4 +8,7 @@ _site
*.sublime-*
_site
dist/*.js
spec/coverage
coverage/
*.js.html
index.html
.mailmap