Merge https://github.com/friendica/friendica into pull
authorfriendica <info@friendica.com>
Tue, 5 Feb 2013 23:10:23 +0000 (15:10 -0800)
committerfriendica <info@friendica.com>
Tue, 5 Feb 2013 23:10:23 +0000 (15:10 -0800)
commit79e9214a755e32e2a2e381961dcce9297eb422ee
tree649c3a9dc7249e4f385ab87ba341d32ec307c5f4
parent9bf836450658c8894ee7560a8447a94622b0b1a2
parent6690cd3fd8963388547ebfcd12ef0784dd794cea
Merge https://github.com/friendica/friendica into pull