popup-kill-ring recipe
popup-kill-ring on github with autoloads and package-require
popup-kill-ring on github with autoloads and package-require
Merge branch 'master' of http://github.com/waymondo/melpa

Conflicts:
	recipes/popup-kill-ring
Add php-auto-yasnippets recipe

https://github.com/ejmr/php-auto-yasnippets
Merge pull request #936 from krisajenkins/master

Adding clojure-cheatsheet.
Add efire recipe
Merge pull request #934 from yasuyk/php-auto-yasnippets

Add php-auto-yasnippets recipe
elpy: include snippets folder
Merge pull request #938 from ptrv/elpy-with-snippets

elpy: include snippets folder
Delete citrus-mode, mactag & package-spec (closes #939)
Add god-mode
Add elisp-sandbox (closes #940)
Add magit-tramp
Add tronesque-theme
Add helm-recoll
Merge pull request #937 from capitaomorte/patch-1

Add efire recipe
Add auto-yasnippet.
Merge pull request #941 from abo-abo/master

Add auto-yasnippet.
Remove company-cmake, it's been merged into company