]> git.mxchange.org Git - friendica-addons.git/commitdiff
Merge commit 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Sat, 7 Apr 2012 16:33:41 +0000 (18:33 +0200)
committerMichael Vogel <icarus@dabo.de>
Sat, 7 Apr 2012 16:33:41 +0000 (18:33 +0200)

Trivial merge