Merge https://github.com/friendica/friendica-addons into apull
authorfriendica <info@friendica.com>
Mon, 26 Aug 2013 00:54:26 +0000 (17:54 -0700)
committerfriendica <info@friendica.com>
Mon, 26 Aug 2013 00:54:26 +0000 (17:54 -0700)
Conflicts:
twitter.tgz

1  2 
fbpost.tgz
fromgplus.tgz
public_server.tgz
pumpio.tgz
statusnet.tgz
twitter.tgz
wppost.tgz

diff --cc fbpost.tgz
index 823a4f3,823a4f3..7aefd5d
Binary files differ
diff --cc fromgplus.tgz
index ce6f1b1,ce6f1b1..4c5fb12
Binary files differ
index 8fcf610,8fcf610..ec9c017
Binary files differ
diff --cc pumpio.tgz
index e2492b1,e2492b1..2441430
Binary files differ
diff --cc statusnet.tgz
index d560e9b,d560e9b..57ce110
Binary files differ
diff --cc twitter.tgz
index 73d2d77,945586c..795a7cd
mode 100755,100755..100644
Binary files differ
diff --cc wppost.tgz
index 404ea13,404ea13..710221d
Binary files differ