fix typo
Merge remote-tracking branch 'upstream/master'
Merge pull request #161 from chrisyue/master

fix typoes
添加 javascript_jquery.snippets 软连接到 javascript-jquery.snippets
用来支持 neosnippet
Merge pull request #162 from allenm/master

Make the jquery snippet support the Shougo's neosnippet
add reqr to expand to require_relative
A more complete property snippet for python.

This snippet is inspired by the snippet provided by Sublime Text. The
current snippet in the upstream repository is missing at least two
lines:

    return locals()
$1 = property(**$1())
Added elif snippet to htmldjango.
Fixing numbering in html snippets.
Merge pull request #166 from jmatth/html_css_fix

Fixing numbering in html snippets.
Merge pull request #165 from oa/master

Updated python property snippet and added elif snippet to htmldjango
Add more rspec snippets.
Merge pull request #167 from iurifq/master

More ruby rspec snippets
Fixed the {% with %} template tag from htmldjango.snippets
Merge remote-tracking branch 'upstream/master'
Merge pull request #168 from oa/master

Fixed the {% with %} template tag from htmldjango.snippets
document renaming of branch
go: type os.Error became built-in type error after go r60.
Merge pull request #169 from akrennmair/master

go.snippets: changed os.Error to error because that type changed after Go r60.
Fix go functions