]> git.mxchange.org Git - friendica-addons.git/commitdiff
Merge remote branch 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Fri, 29 Jun 2012 19:44:50 +0000 (21:44 +0200)
committerMichael Vogel <icarus@dabo.de>
Fri, 29 Jun 2012 19:44:50 +0000 (21:44 +0200)

Trivial merge