initial commit
Merge branch 'master' of github.com:imathis/octopress
Merge pull request #29 from jlong/edge

removed sitemap_generator in favor of generate_sitemap plugin
Merge pull request #33 from pw/archives_fix

Archives fix
Merge branch 'edge' of github.com:imathis/octopress into edge
Merge pull request #34 from kent/edge

Updated path to plugins.
Merge branch 'edge' of github.com:imathis/octopress into edge
Merge pull request #35 from smt/pull-request-1

Updated Gemfile.lock and some deprecated Compass mixin args
Merge branch 'master' of github.com:imathis/octopress
Merge pull request #42 from lukearmstrong/patch-1

Stops the (scary) warning bar in Firefox about storing data for offline u
Merge pull request #43 from ballou88/master

Rakefile
Merge branch 'master' of github.com:imathis/octopress
Merge pull request #49 from lukearmstrong/patch-3

Fixed rake update_source
Merge pull request #51 from lukearmstrong/patch-5

Fixed rake update_source and rake update_style
Merge pull request #53 from zumda/master

Code blocks didn't work with textile
Merge branch 'master' of https://github.com/woodwardjd/octopress into woodwardjd-master
Merge branch 'woodwardjd-master'
Merge pull request #64 from adamnbowen/master

added source.old and sass.old into .gitignore
Merge pull request #74 from smt/feed-fix

Update atom.xml to use site.title and expand_urls
Merge pull request #73 from pilif/twitter-js-scope-fix

correctly scope locals