Fix codeblock rendering with HAML when there is a filetype defined.
Merge branch 'master' of https://github.com/imathis/octopress
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 remote-tracking branch 'upstream/master'