translate
just correct a wrong word
2014.08.31
Merge pull request #7 from tg123/master

update
Merge pull request #100 from spacewander/master

translating in Nov 6th
update nov 6
fix conflict
Merge branch 'tg123-master'
Merge pull request #101 from gdqyn/master

update nov 6
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'
daily translating patch nov 9
daily translating patch nov 16
data from commandlinefu.com
daily translating patch nov 17
daily translating patch nov 21
translate in 2014/11/22