diaspora/diaspora — pull request #3449 by hfase01 (2012-07-12 06:03:50+00:00)
Title: Clean merge of Octopress.

This might not be for everyone, it is a clean working merge though.

Basicly I tweaked the Rakefile, Gemfile and merged the "plugins" directory from Octopress. (along with 600 commits of history for that directory)

I have no idea how many podmins may find this useful, if this is not useful it will not hurt my feelings any if it does not get pulled. :D If you like it, enjoy!