Merge remote branch 'friendica/master'
authorfabrixxm <fabrix.xm@gmail.com>
Wed, 1 Aug 2012 06:42:40 +0000 (02:42 -0400)
committerfabrixxm <fabrix.xm@gmail.com>
Wed, 1 Aug 2012 06:42:40 +0000 (02:42 -0400)

Trivial merge