]> git.mxchange.org Git - friendica-addons.git/commitdiff
Merge remote branch 'upstream/master'
authorMichael <icarus@dabo.de>
Sat, 14 Apr 2012 11:03:51 +0000 (13:03 +0200)
committerMichael <icarus@dabo.de>
Sat, 14 Apr 2012 11:03:51 +0000 (13:03 +0200)

Trivial merge