Merge branch 'master' of gitorious.org:social/mainline into social-master

Conflicts:
	actions/atompubmembershipfeed.php
	actions/atompubshowmembership.php
	actions/atompubsubscriptionfeed.php
	plugins/OStatus/actions/peopletagsalmon.php
	plugins/OStatus/classes/Ostatus_profile.php
	plugins/OStatus/lib/salmonaction.php
	scripts/stopdaemons.sh

Signed-off-by: Roland Häder <haeder@hmmdeutschland.de>

diff --cc actions/apitimelineuser.php
Simple merge

diff --cc actions/atompubshowsubscription.php
Simple merge

diff --cc actions/deletegroup.php
Simple merge

diff --cc actions/public.php
Simple merge

diff --cc actions/replies.php
Simple merge

diff --cc actions/showgroup.php
Simple merge

diff --cc actions/showprofiletag.php
Simple merge

diff --cc actions/tag.php
Simple merge

diff --cc classes/Notice.php
Simple merge

diff --cc lib/action.php
Simple merge

diff --cc lib/default.php
Simple merge

diff --cc lib/framework.php
Simple merge

diff --cc lib/noticelistitem.php
Simple merge

diff --cc lib/searchaction.php
Simple merge

diff --cc lib/util.php
Simple merge

diff --cc plugins/Directory/lib/sortablegrouplist.php
Simple merge

diff --cc plugins/EmailSummary/scripts/sendemailsummary.php
Simple merge

diff --cc plugins/Favorite/actions/atompubfavoritefeed.php
Simple merge

diff --cc plugins/OStatus/OStatusPlugin.php
Simple merge

diff --cc plugins/OStatus/classes/FeedSub.php
Simple merge

diff --cc plugins/OStatus/classes/Ostatus_profile.php
Simple merge

diff --cc plugins/OStatus/lib/salmonaction.php
index bb3a6180d82edbd4451ba7f6b48147c6c7b3d2c4,5e7d8f35a34517a6ef1937094d373a3c0d497563..eb68632d38ff3f5e4821f530803ef6d6c07bbd2f
--- 1/plugins/OStatus/lib/salmonaction.php
--- 2/plugins/OStatus/lib/salmonaction.php
+++ b/plugins/OStatus/lib/salmonaction.php
@@@ -60,8 -66,8 +66,8 @@@ class SalmonAction extends Actio
          }
  
          // Cryptographic verification test
-         if (!$magic_env->verify($profile)) {
+         if (!$magic_env->verify($this->actor)) {
 -            common_log(LOG_DEBUG, "Salmon signature verification failed.");
 +            common_debug("Salmon signature verification failed.");
              // TRANS: Client error.
              $this->clientError(_m('Salmon signature verification failed.'));
          }

diff --cc plugins/OStatus/scripts/update-profile-data.php
Simple merge

diff --cc scripts/stopdaemons.sh
index b4a3725d8dcfba215f1785c87e001b0b82879309,e725dd0bf0064588e490eecb90def35bc4d10ba9..274f0903e25a75ad1c5ff5347333b06818625885
--- 1/scripts/stopdaemons.sh
--- 2/scripts/stopdaemons.sh
+++ b/scripts/stopdaemons.sh
@@@ -31,9 -39,9 +39,9 @@@ if [ $# -gt 1 ]; the
  fi
  
  SDIR=`dirname $0`
 -DIR=`php $SDIR/getpiddir.php $SITE`
 +DIR=`$SDIR/getpiddir.php $SITE`
  
- DAEMONS=`$SDIR/getvaliddaemons.php`
 -DAEMONS=`php $SDIR/getvaliddaemons.php $ARGSG`
++DAEMONS=`$SDIR/getvaliddaemons.php $ARGSG`
  
  for f in $DAEMONS; do
      f=$(basename $f .php)