]> git.mxchange.org Git - friendica-addons.git/commitdiff
Merge remote branch 'upstream/master'
authorMichael <icarus@dabo.de>
Fri, 2 Mar 2012 09:32:57 +0000 (10:32 +0100)
committerMichael <icarus@dabo.de>
Fri, 2 Mar 2012 09:32:57 +0000 (10:32 +0100)

Trivial merge