Merge branch 'master', remote-tracking branch 'lctt/master'
Merge branch 'master', remote-tracking branch 'lctt/master'
Merge pull request #4 from LCTT/master

update
translated
发布：What Heartbleed Teaches Us--Be An Open Source Contributor, Not Just A User

@geekpi 明天发布
发布：20140603 Linux Foundation to donate portion of membership fees to Code.org

@yechunxiao19 明天发布
Merge branch 'master', remote-tracking branch 'lctt/master'
translating
Merge pull request #1141 from linuhap/master

【translating】How To Extract Images From Videos Using ffmpeg
Merge pull request #1142 from alim0x/master

[翻译完成]20140607 Steam Hits The Big 500 For Linux Games.md
Merge pull request #1143 from MikeCoder/master

Translating
发布：20140607 Steam Hits The Big 500 For Linux Games

@alim0x 发布了
Merge pull request #5 from LCTT/master

update
alim0x translating
finish translating
发布：20140604 Setup Virtual Hosts In Apache On Ubuntu 14.04 LTS

@disylee 发布了
pr for translating
Merge pull request #1144 from alim0x/patch-2

alim0x translating
Merge pull request #1145 from MikeCoder/master

finish translating
Merge pull request #1146 from stduolc/master

Pr for translating