Merge branch 'develop' - emacs-emojify - fork of https://github.com/iqbalansari/emacs-emojify

commit 51d48398423195e74ac5178397ac3241eb2b26dd
parent 0dfe1bb23c5035eca15a92ea7e9925f384ad9395
Author: Iqbal Ansari <iqbalansari02@yahoo.com>
Date:   Tue,  1 Mar 2016 17:08:01 +0530

Merge branch 'develop'

Diff is too large, output suppressed.

	emacs-emojify fork of https://github.com/iqbalansari/emacs-emojify
	Log \| Files \| Refs \| LICENSE