Merge remote branch 'friendica/master'
authorfabrixxm <fabrix.xm@gmail.com>
Wed, 27 Feb 2013 09:33:53 +0000 (04:33 -0500)
committerfabrixxm <fabrix.xm@gmail.com>
Wed, 27 Feb 2013 09:33:53 +0000 (04:33 -0500)
commit2517e7716ebcd118b170695b77b3bff074e620fe
treebc3b5852708c7553c6ccc028570c2d17c2b20c9d
parent7b71fec6222988a89423ee4584c87927f1a6e149
parentedefb77c3085f134d405132e440ac112e11e86ab
Merge remote branch 'friendica/master'