danielgrippi 775e7b6b2b Merge branch 'master' into follow ... Conflicts: features/step_definitions/user_steps.rb		2011-05-17 11:33:35 -07:00
..
diaspora
postzord
app_config_spec.rb
direction_detector_spec.rb
encryptor_spec.rb
fake_spec.rb
hcard_spec.rb
pubsubhubbub_spec.rb
rake_helper_spec.rb
resque_job_logging_spec.rb
salmon_salmon_spec.rb
splunk_logging_spec.rb
web_hooks_spec.rb
webfinger_profile_spec.rb
webfinger_spec.rb
youtube_titles_spec.rb