Please enter the commit message for your changes. Lines starting
with '#' will be ignored, and an empty message aborts the commit.

Committer: hulei <hulei@CentOS-X230.(none)>

On branch devel
Your branch is behind 'origin/devel' by 1 commit, and can be fast-forwarded.

Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	new file:   #init-font.el#
        modified:   init-display.el
        modified:   init-font.el
	new file:   init-locale.el
	modified:   init-org.el
	modified:   init.el
Merge branch 'devel' of github.com:bbhl79/.emacs.d into devel

Conflicts:
	init-locale.el

	modified:   init-locale.el