]> git.mxchange.org Git - friendica-addons.git/commitdiff
Merge commit 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Mon, 2 Apr 2012 20:36:59 +0000 (22:36 +0200)
committerMichael Vogel <icarus@dabo.de>
Mon, 2 Apr 2012 20:36:59 +0000 (22:36 +0200)

Trivial merge