]> git.mxchange.org Git - friendica-addons.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Thu, 15 Nov 2012 20:53:31 +0000 (21:53 +0100)
committerMichael Vogel <icarus@dabo.de>
Thu, 15 Nov 2012 20:53:31 +0000 (21:53 +0100)

Trivial merge