Merge branch 'master' of github.com:diaspora/diaspora into production

lib/salmon/salmon.rb

@@ -82,7 +82,7 @@ module Salmon
     <entry xmlns='http://www.w3.org/2005/Atom'>
     <author>
       <name>#{@author.real_name}</name>
-      <uri>acct:#{@author.email}</uri>
+      <uri>acct:#{@author.owner.diaspora_handle}</uri>
     </author>
       #{@magic_sig.to_xml}
       </entry>

spec/lib/salmon_salmon_spec.rb

@@ -36,7 +36,7 @@ describe Salmon do
   end
 
   it 'should parse out the author email' do
-    @parsed_salmon.author_email.should == @user.person.email 
+    @parsed_salmon.author_email.should == @user.diaspora_handle
   end
 
   it 'should reference a local author' do