]> git.mxchange.org Git - friendica.git/commitdiff
Merge branch 'fabrixxm-master'
authorFriendika <info@friendika.com>
Thu, 6 Jan 2011 20:42:29 +0000 (12:42 -0800)
committerFriendika <info@friendika.com>
Thu, 6 Jan 2011 20:42:29 +0000 (12:42 -0800)

Trivial merge