]> git.mxchange.org Git - friendica-addons.git/commitdiff
Merge remote branch 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Sat, 23 Jun 2012 10:54:10 +0000 (12:54 +0200)
committerMichael Vogel <icarus@dabo.de>
Sat, 23 Jun 2012 10:54:10 +0000 (12:54 +0200)

Trivial merge