Merge pull request #2 from LCTT/master

try to update from LCTT
Merge pull request #1 from LCTT/master

pull
translating by owen-carter
Merge branch 'master' of https://github.com/LCTT/TranslateProject

Conflicts:
	sources/news/20140619 Improve Battery Life with Laptop Mode Tools 1.65.md
adjust
Merge branch 'master' of https://github.com/LCTT/TranslateProject
Merge pull request #1229 from 2q1w2007/master

2q1w2007翻译中20140620 Celebrating 30 Years of X.md
[Translated] 20140620 ENCRYPT DNS TRAFFIC IN LINUX WITH DNSCRYPT (VIA OPENDNS).md
[Translated] 20140620 ENCRYPT DNS TRAFFIC IN LINUX WITH DNSCRYPT (VIA OPENDNS).md
[Translated]20140620 ENCRYPT DNS TRAFFIC IN LINUX WITH DNSCRYPT (VIA OPENDNS).md
[Translating] 20140620 How to enable testing and unstable repository on Debian.md
translating by john
translate1
Merge pull request #1232 from 213edu/master

[Translated] 20140620 ENCRYPT DNS TRAFFIC IN LINUX WITH DNSCRYPT (VIA OPENDNS).md
Merge pull request #1234 from 213edu/patch-3

[Translating] 20140620 How to enable testing and unstable repository on ...
发布：20140620 Celebrating 30 Years of X

@2q1w2007
发布：20140619 Red Hat to Acquire eNovance, Focus Together on OpenStack

@tengpeng
发布：20140619 Improve Battery Life with Laptop Mode Tools 1.65

@2q1w2007
Merge pull request #2 from LCTT/master

pull
Update and rename sources/talk/20140609 Has Microsoft really changed its attitude toward open source.md to translated/talk/20140609 Has Microsoft really changed its attitude toward open source.md