]> git.mxchange.org Git - friendica-addons.git/commitdiff
Merge remote branch 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Sun, 15 Jul 2012 15:24:41 +0000 (17:24 +0200)
committerMichael Vogel <icarus@dabo.de>
Sun, 15 Jul 2012 15:24:41 +0000 (17:24 +0200)

Trivial merge