]> git.mxchange.org Git - friendica.git/commitdiff
Merge branch 'fabrixxm-master'
authorFriendika <info@friendika.com>
Mon, 24 Jan 2011 11:03:56 +0000 (03:03 -0800)
committerFriendika <info@friendika.com>
Mon, 24 Jan 2011 11:03:56 +0000 (03:03 -0800)

Trivial merge