]> git.mxchange.org Git - friendica.git/commitdiff
Merge branch 'omigeot-master'
authorFriendika <info@friendika.com>
Tue, 12 Apr 2011 22:18:54 +0000 (15:18 -0700)
committerFriendika <info@friendika.com>
Tue, 12 Apr 2011 22:18:54 +0000 (15:18 -0700)

Trivial merge