Merge branch 'master' into social-master

diff --combined plugins/Bookmark/BookmarkPlugin.php
index fc4b62d5d0fd3ab32a4f4c53f192a7b50fff3397,47663271aa4864938c84724cc267de629f57adfa..8f7e827d78184636ee91245b1978ab12dd1bc106
--- 1/plugins/Bookmark/BookmarkPlugin.php
--- 2/plugins/Bookmark/BookmarkPlugin.php
+++ b/plugins/Bookmark/BookmarkPlugin.php
@@@ -61,7 -61,7 +61,7 @@@ class BookmarkPlugin extends MicroAppPl
       *
       * @return boolean hook value
       */
 -    function onUserRightsCheck($profile, $right, &$result)
 +    function onUserRightsCheck(Profile $profile, $right, &$result)
      {
          if ($right == self::IMPORTDELICIOUS) {
              $result = !$profile->isSilenced();
@@@ -167,7 -167,7 +167,7 @@@
       *
       * @return boolean hook value
       */
-     function onEndInitializeQueueManager($qm)
+     function onEndInitializeQueueManager(QueueManager $qm)
      {
          $qm->connect('dlcsback', 'DeliciousBackupImporter');
          $qm->connect('dlcsbkmk', 'DeliciousBookmarkImporter');
@@@ -223,7 -223,7 +223,7 @@@
       *
       * @return boolean hook value
       */
 -    function onEndProfileSettingsActions($action)
 +    function onEndProfileSettingsActions(Action $action)
      {
          $user = common_current_user();