]> git.mxchange.org Git - friendica-addons.git/commitdiff
Merge commit 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Thu, 15 Mar 2012 20:12:25 +0000 (21:12 +0100)
committerMichael Vogel <icarus@dabo.de>
Thu, 15 Mar 2012 20:12:25 +0000 (21:12 +0100)

Trivial merge