]> git.mxchange.org Git - friendica.git/commitdiff
Merge remote branch 'friendica/master'
authorroot <root@debian.(none)>
Fri, 1 Jun 2012 07:10:57 +0000 (03:10 -0400)
committerroot <root@debian.(none)>
Fri, 1 Jun 2012 07:10:57 +0000 (03:10 -0400)

Trivial merge