]> git.mxchange.org Git - friendica.git/commitdiff
Merge branch 'master' of github.com:fabrixxm/friendika
authorfabrixxm <fabrix.xm@gmail.com>
Sat, 29 Jan 2011 09:14:14 +0000 (10:14 +0100)
committerfabrixxm <fabrix.xm@gmail.com>
Sat, 29 Jan 2011 09:14:14 +0000 (10:14 +0100)

Trivial merge