Merge branch 'edge' of github.com:imathis/octopress into edge
Merge branch 'edge' of github.com:imathis/octopress into edge
Merge branch 'master' of github.com:imathis/octopress
Merge branch 'woodwardjd-master'
Merge pull request #73 from pilif/twitter-js-scope-fix

correctly scope locals
Merge branch 'master' of github.com:imathis/octopress
Merge branch 'master' of https://github.com/rwz/octopress into rwz-master
Merge pull request #82 from jakemcc/7d6062b5eb3ebd2720fe5b836add73f9c88d2589

minor tweak to _typography.scss to have pp, code, and tt extend style that exists
Merge branch 'master' of github.com:imathis/octopress
Merge branch 'github-repositories-plugin' of https://github.com/pilif/octopress into pilif-github-repositories-plugin
Merge branch 'master' of github.com:imathis/octopress
Merge branch 'pilif-github-repositories-plugin'
Merge branch 'master' of https://github.com/fhemberger/octopress into fhemberger-master

Conflicts:
	plugins/category_generator.rb
Merge branch 'post_filters_plugin' of https://github.com/tedkulp/octopress into post_filters
Merge branch 'post_filters'
Merge branch 'sinatra_static_server' of https://github.com/scottwater/octopress into scottwater-sinatra_static_server

Conflicts:
	Gemfile
	Gemfile.lock
Merge branch 'master' of github.com:imathis/octopress
Merge branch 'master' of github.com:imathis/octopress into compass
Merge pull request #180 from victor/patch-1

Allow capitalization after a period.
Merge branch 'master' of github.com:imathis/octopress