From: friendica <info@friendica.com>
Date: Wed, 9 May 2012 00:05:12 +0000 (-0700)
Subject: Merge https://github.com/tonybaldwin/friendica-addons into apull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=e1b25a1556352fd1c8564c5060a3fce09736ee38;p=friendica-addons.git

Merge https://github.com/tonybaldwin/friendica-addons into apull

Conflicts:
	posterous/posterous.php
---

e1b25a1556352fd1c8564c5060a3fce09736ee38
diff --cc posterous.tgz
index 20cf7d88,88643513..f8080587
Binary files differ
diff --cc posterous/posterous.php
index 35c0d1e7,eda2a93a..25a009c5
--- a/posterous/posterous.php
+++ b/posterous/posterous.php
@@@ -138,10 -153,6 +153,9 @@@ function posterous_post_local(&$a,&$b) 
  
  function posterous_send(&$a,&$b) {
  
 +	logger('posterous_send: invoked');
- 	logger('posterous: plugin disabled. API endpoint no longer responds.');
 +	return;
 +
      if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))
          return;