Ìí¼ÓÁËPHPº¯Êý
Merge branch 'master' of github.com:beixingqiao/emacs

Conflicts:
	.backups/!drive_d!emacs-24.3!.emacs.~10~
	.backups/!drive_d!emacs-24.3!.emacs.~11~
	.backups/!drive_d!emacs-24.3!.emacs.~13~
	.backups/!drive_d!emacs-24.3!.emacs.~14~
	.backups/!drive_d!emacs-24.3!.emacs.~15~
	.backups/!drive_d!emacs-24.3!.emacs.~16~
	.backups/!drive_d!emacs-24.3!.emacs.~17~
	.backups/!drive_d!emacs-24.3!.emacs.~18~
	.emacs