Merge branch 'friendika-master'
authorfabrixxm <fabrix.xm@gmail.com>
Thu, 3 Feb 2011 06:24:58 +0000 (07:24 +0100)
committerfabrixxm <fabrix.xm@gmail.com>
Thu, 3 Feb 2011 06:24:58 +0000 (07:24 +0100)

Trivial merge