]> git.mxchange.org Git - friendica-addons.git/commitdiff
Merge commit 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Sat, 14 Apr 2012 11:15:43 +0000 (13:15 +0200)
committerMichael Vogel <icarus@dabo.de>
Sat, 14 Apr 2012 11:15:43 +0000 (13:15 +0200)

Trivial merge