]> git.mxchange.org Git - friendica-addons.git/commitdiff
Merge commit 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Wed, 11 Apr 2012 06:29:23 +0000 (08:29 +0200)
committerMichael Vogel <icarus@dabo.de>
Wed, 11 Apr 2012 06:29:23 +0000 (08:29 +0200)

Trivial merge