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
Remove company-cmake, it's been merged into company
Include rspec-mode snippets directory
get git{-commit,config,ignore}-mode from new upstream
Merge pull request #942 from dgutov/remove-company-cmake

Remove company-cmake, it's been merged into company
Merge pull request #943 from dgutov/rspec-include-snippets

Include rspec-mode snippets directory
Merge pull request #944 from tarsius/git-modes

get git{-commit,config,ignore}-mode from new upstream
Add magit-find-file recipe
Merge pull request #945 from bradleywright/magit-find-file

Add magit-find-file recipe
Suppress flycheck (if enabled) when editing recipes
Update source for interaction-log
Add a recipe for minibuffer-complete-cycle.
Merge pull request #948 from knu/minibuffer-complete-cycle

Add a recipe for minibuffer-complete-cycle.
Update confluence recipe and remove confluence-edit (closes #946)
Added package+
Add refheap
Merge pull request #950 from zenspider/package+

Added package+