Brandon Mathis ed0c220523 Merge branch 'master' of https://github.com/fhemberger/octopress into fhemberger-master ...

Conflicts:
	plugins/category_generator.rb

2011-09-04 08:37:22 -05:00

..

classic

Merge branch 'master' of https://github.com/fhemberger/octopress into fhemberger-master

2011-09-04 08:37:22 -05:00