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 openstack-cgit-browse-file
Remove example from o-blog (fixes #969)
Add some missing info to README, fix a couple of typos
Style all README code blocks as lisp
Add git-annex.el

From https://github.com/jwiegley/git-annex-el
Merge pull request #974 from aecay/master

Add git-annex.el
added recipe for org-screenshot
adding a recipe for ez-query-replace
Merge pull request #976 from Wilfred/master

adding a recipe for ez-query-replace
Move to bootstrap 3
Added mustang-theme.
Merge pull request #977 from mswift42/master

Added mustang-theme.
Darken navbar slightly
Merge pull request #975 from dfeich/master

added recipe for org-screenshot
Revert "Darken navbar slightly"

This reverts commit 2792d4bc331fa4685b9637281c0f9c05d6452245.
Add insert-shebang