]> git.mxchange.org Git - friendica.git/commitdiff
Merge branch 'master' of github.com:fabrixxm/friendika
authorfabrixxm <fabrix.xm@gmail.com>
Tue, 1 Feb 2011 17:46:28 +0000 (18:46 +0100)
committerfabrixxm <fabrix.xm@gmail.com>
Tue, 1 Feb 2011 17:46:28 +0000 (18:46 +0100)

Trivial merge