Merge branch 'master' of https://github.com/rogetfan/TranslateProject.git

# By huxuehan
# Via huxuehan
* 'master' of https://github.com/rogetfan/TranslateProject.git:
  正在翻译
Update Daily Ubuntu Tips – Webcam Support In Ubuntu Via Cheese.md
Update Daily Ubuntu Tips – Webcam Support In Ubuntu Via Cheese.md
Update Daily Ubuntu Tips – Webcam Support In Ubuntu Via Cheese.md
translating....
Merge branch 'master' of https://github.com/LCTT/TranslateProject.git

# By wxy (10) and others
# Via Xingyu.Wang (5) and others
* 'master' of https://github.com/LCTT/TranslateProject.git: (26 commits)
  校å?¹完æ¯?,ç´?坏啦:)
  校å?¹中
  [翻译中] 01 The Linux Kernel--Introduction.md
  fix a link error in README
  已校å¯?
  校å?¹中
  发布：Torvalds--Apple's free OS is no threat to Linux
  translating by Vito
  翻译ä¸? by小眼å?
  选é?（The Linux Kernel 系列文章ï¼?
  翻译ä¸? by小眼å?
  an interesting topic
  20131024 选é?（Torvalds 最新言è®?)
  已翻è¯? by小眼å?
  20131024 选é??
  归档201309的译æ?
  清除了部分过期文ç«?
  发布：Ubuntu 13.10 (Saucy Salamander) Officially Released
  校å?¹完毕Daily Ubuntu tips
  发布：Install Rhythmbox 3.0 In Ubuntu 13.10 Or 13.04
  ...
Merge branch 'master' of https://github.com/rogetfan/TranslateProject.git

# By huxuehan
# Via huxuehan
* 'master' of https://github.com/rogetfan/TranslateProject.git:
  Update Daily Ubuntu Tips â? Webcam Support In Ubuntu Via Cheese.md
  Update Daily Ubuntu Tips â? Webcam Support In Ubuntu Via Cheese.md
  Update Daily Ubuntu Tips â? Webcam Support In Ubuntu Via Cheese.md
Merge branch 'master' of https://github.com/LCTT/TranslateProject

merge
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
modified (1)
Merge branch 'master' of https://github.com/LCTT/TranslateProject
Merge branch 'master' of https://github.com/LCTT/TranslateProject
翻译中by runningwater
翻译完成
已翻译 by小眼儿

Signed-off-by: tinyeyeser <tinyeyeser@gmail.com>
Merge branch 'master' of https://github.com/LCTT/TranslateProject
merge
翻译完成
Merge pull request #294 from tinyeyeser/master

已翻译 by小眼儿
翻译中 by小眼儿
完成翻译
Merge branch 'master' of https://github.com/LCTT/TranslateProject

Conflicts:
	sources/di – Disk Information Utility, Better Than df.md