]> git.mxchange.org Git - friendica.git/commitdiff
Merge remote branch 'upstream/master'
authorMichael <icarus@dabo.de>
Mon, 27 Feb 2012 15:31:58 +0000 (16:31 +0100)
committerMichael <icarus@dabo.de>
Mon, 27 Feb 2012 15:31:58 +0000 (16:31 +0100)

Trivial merge