translate
just correct a wrong word
2014.08.31
Merge branch 'master' of https://github.com/dba-lex/commandlinefu.cn into dba-lex-master

Conflicts:
	_data/openssl_s_client_connect_www_example_com_443_tmp_example_com_cert.yaml
	_data/vimdiff_file_scp_user_host_file.yaml
Merge branch 'dba-lex-master'