Fix codeblock rendering with HAML when there is a filetype defined.
fix old style gist url not found issue
Merge branch 'master' of https://github.com/imathis/octopress
Add proper disqus identifier comment count links

Fixes #277
Fix Disqus over https.

  Forcing http:// as protocol will make Disqus fail when server over
  https for security reasons.
Merge pull request #1384 from kAworu/fix-disqus-over-https

Fix Disqus over https.
Merge branch 'fix-gist-plugin' of git://github.com/aleiphoenix/octopress into aleiphoenix-fix-gist-plugin

* 'fix-gist-plugin' of git://github.com/aleiphoenix/octopress:
  fix old style gist url not found issue
Clean up Gist redirection.
Error handling FTW
Merge pull request #1385 from imathis/aleiphoenix-fix-gist-plugin

Handle Gists returning 302's
Merge branch 'master' of https://github.com/imathis/octopress
Use a protocol-relative url to load disqus over https or http
removed superfluous parentheses
Merge pull request #1390 from pfista/master

Use a protocol-relative url to load disqus over https or http
Merge pull request #1254 from kAworu/master

make codeblock play nice with HAML
Removed space to fix HAML compatibility on include_code.
Merge branch 'master' of git://github.com/imathis/octopress into source
Updated from origin master