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

Signed-off-by: Roland Haeder <roland@mxchange.org>

diff --cc classes/Avatar.php
Simple merge

diff --cc classes/Confirm_address.php
Simple merge

diff --cc classes/File.php
Simple merge

diff --cc classes/File_redirection.php
Simple merge

diff --cc classes/File_thumbnail.php
Simple merge

diff --cc classes/Memcached_DataObject.php
Simple merge

diff --cc classes/Notice.php
Simple merge

diff --cc classes/User_group.php
Simple merge

diff --cc lib/default.php
Simple merge

diff --cc plugins/Blog/classes/Blog_entry.php
Simple merge

diff --cc plugins/Bookmark/classes/Bookmark.php
Simple merge

diff --cc plugins/DirectMessage/classes/Message.php
Simple merge

diff --cc plugins/Event/classes/Happening.php
Simple merge

diff --cc plugins/Event/classes/RSVP.php
Simple merge

diff --cc plugins/GNUsocialPhoto/classes/Photo.php
Simple merge

diff --cc plugins/GNUsocialVideo/classes/Video.php
index 9746948e16f93aefc7bc2fc2ef7f2024d188df0e,09c1f6b8443a0ee17ef11d8d8489228aebfc4156..9ba395d8cad839157f6f6a3ee75a0528280cda1b
--- 1/plugins/GNUsocialVideo/classes/Video.php
--- 2/plugins/GNUsocialVideo/classes/Video.php
+++ b/plugins/GNUsocialVideo/classes/Video.php
@@@ -39,11 -39,11 +39,11 @@@ class Video extends Managed_DataObjec
  
      public $__table = 'video'; // table name
      public $id;                // char (36) // UUID
-     public $uri;               // varchar (255)  // This is the corresponding notice's uri.
-     public $url;               // varchar (255)
+     public $uri;               // varchar (191)   This is the corresponding notice's uri.   not 255 because utf8mb4 takes more space
+     public $url;               // varchar (191)   not 255 because utf8mb4 takes more space
      public $profile_id;        // int
  
 -    public static function getByNotice($notice)
 +    public static function getByNotice(Notice $notice)
      {
          return self::getKV('uri', $notice->uri);
      }

diff --cc plugins/NoticeTitle/classes/Notice_title.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/Oembed/classes/File_oembed.php
Simple merge

diff --cc plugins/OpenID/OpenIDPlugin.php
Simple merge

diff --cc plugins/Poll/classes/Poll.php
Simple merge

diff --cc plugins/Poll/classes/Poll_response.php
Simple merge

diff --cc plugins/QnA/classes/QnA_Answer.php
Simple merge

diff --cc plugins/QnA/classes/QnA_Question.php
Simple merge