translation of simplified chinese
translation of simplified chinese
Merge branch 'master' of github.com:gelosie/git-flow-cheatsheet

Conflicts:
	index.zh_CN.html
fix with markdown syntax
fix
Merge pull request #3 from gelosie/master

translation of simplified chinese
fix translation links
fix fork me link
推敲前の最初の版
リンク修正
文言修正
文章がおかしい部分を修正
Merge pull request #6 from tfunato/gh-pages

Japanese translation
traducción al castellano
Merge branch 'gh-pages' of ssh://github.com/eazel7/git-flow-cheatsheet into gh-pages
Update index.es.html

cambio 'created by' a 'creado por'
Merge pull request #7 from eazel7/gh-pages

Translation to spanish
Spanish translation fixes. Coherent translation with spanish version of Pro Git by Scott Chacon. http://git-scm.com/book/es/
Merge branch 'SpanishTranslateFix' into gh-pages
Merge pull request #8 from jlvaquero/gh-pages

Spanish translation fixes