Merge https://github.com/friendica/friendica into pull
authorfriendica <info@friendica.com>
Sat, 16 Feb 2013 01:41:42 +0000 (17:41 -0800)
committerfriendica <info@friendica.com>
Sat, 16 Feb 2013 01:41:42 +0000 (17:41 -0800)
commitbc03bb5a4a76363b59cb6b20b17f8b79db122b22
tree83b65ce61e4bf7c30ba0275c5a2bbd684414ee1e
parentbd8350562e779567e7024ad311d43d71b0894b36
parent9bf0f602903de14dac78868245e54c59cdd826a7
Merge https://github.com/friendica/friendica into pull