]> git.mxchange.org Git - friendica-addons.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Tue, 29 Oct 2013 07:13:33 +0000 (08:13 +0100)
committerMichael Vogel <icarus@dabo.de>
Tue, 29 Oct 2013 07:13:33 +0000 (08:13 +0100)

Trivial merge