]> git.mxchange.org Git - friendica-addons.git/commitdiff
Merge remote branch 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Wed, 9 May 2012 12:57:46 +0000 (14:57 +0200)
committerMichael Vogel <icarus@dabo.de>
Wed, 9 May 2012 12:57:46 +0000 (14:57 +0200)

Trivial merge