hgjj
hghjk
Merge branch 'master' of https://github.com/slitaz-source/git_test

Conflicts:
	211212.txt
2121