Merge pull request #1 from LCTT/master

try to update according to the wiki
Create 20140610 IPFire 2.13 Core 78 Linux Firewall OS Receives OpenSSL Fixes.md
Delete 20140610 IPFire 2.13 Core 78 Linux Firewall OS Receives OpenSSL Fixes.md
Update 20140610 IPFire 2.13 Core 78 Linux Firewall OS Receives OpenSSL Fixes.md
Update 20140610 IPFire 2.13 Core 78 Linux Firewall OS Receives OpenSSL Fixes.md
Merge pull request #1207 from GOLinux/master

Translating:20140610 IPFire 2.13 Core 78 Linux Firewall OS Receives OpenSSL Fixes.md
Merge pull request #2 from LCTT/master

update
[translating]How to Rescue a Non-booting GRUB 2
Merge pull request #1208 from Linchenguang/master

[translating]How to Rescue a Non-booting GRUB 2
Merge branch 'master' of https://github.com/2q1w2007/TranslateProject into 2q1w2007-master

Conflicts:
	sources/news/20140610 IPFire 2.13 Core 78 Linux Firewall OS Receives OpenSSL Fixes.md
	deleted:    sources/news/20140610 IPFire 2.13 Core 78 Linux Firewall OS Receives OpenSSL Fixes.md
Merge branch '2q1w2007-master'
20140619-1 选题
owen-carter translating
Merge pull request #1209 from owen-carter/master

owen-carter translating
校对中
20140619-2 选题
Update 20140619 How To Remove Drive Icons From Unity Launcher In Ubuntu 14.04 [Beginner Tips].md
20140619-3 选题
Merge pull request #1210 from lousam/patch-1

Update 20140619 How To Remove Drive Icons From Unity Launcher In Ubuntu ...