Merge commit 'upstream/master'

Conflicts:

	facebook/facebook.php

diff --cc facebook/facebook.php
index bc492f683e9360cffaf9631e808c359a13966d2f,9f873284e54a90e00699f35a1ab6bd56fca70302..1afa996df08aab3163ce906f024acef65093bba3
--- 1/facebook/facebook.php
--- 2/facebook/facebook.php
+++ b/facebook/facebook.php
@@@ -53,12 -53,10 +53,12 @@@
   * - Implement a configuration option to set the polling interval system-wide
   */
  
 -define('FACEBOOK_MAXPOSTLEN', 420);
 +// Size of maximum post length increased
 +// see http://www.facebook.com/schrep/posts/203969696349811
 +// define('FACEBOOK_MAXPOSTLEN', 420);
 +define('FACEBOOK_MAXPOSTLEN', 63206);
- 
+ define('FACEBOOK_SESSION_ERR_NOTIFICATION_INTERVAL', 259200); // 3 days
  
 -
  function facebook_install() {
        register_hook('post_local',       'addon/facebook/facebook.php', 'facebook_post_local');
        register_hook('notifier_normal',  'addon/facebook/facebook.php', 'facebook_post_hook');