Merge remote branch 'friendica/master'
authorfabrixxm <fabrix.xm@gmail.com>
Tue, 24 Jul 2012 14:40:33 +0000 (10:40 -0400)
committerfabrixxm <fabrix.xm@gmail.com>
Tue, 24 Jul 2012 14:40:33 +0000 (10:40 -0400)
commita3de3d8008f6f90a378a1f8adf2b8b5720d3b2cb
treee93fa6f1d168e13caba9c27e9930191595f05357
parenteab6873cf4aba5ef7d1003c2dacc0276fb4ba9a5
parent2eccbcae25e680d2da8137bdef3d50da425b238d
Merge remote branch 'friendica/master'