]> git.mxchange.org Git - friendica.git/commitdiff
Merge branch 'friendika-master'
authorfabrixxm <fabrix.xm@gmail.com>
Sun, 6 Feb 2011 20:27:24 +0000 (21:27 +0100)
committerfabrixxm <fabrix.xm@gmail.com>
Sun, 6 Feb 2011 20:27:24 +0000 (21:27 +0100)

Trivial merge