]> git.mxchange.org Git - friendica-addons.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Sat, 7 Jun 2014 13:32:22 +0000 (15:32 +0200)
committerMichael Vogel <icarus@dabo.de>
Sat, 7 Jun 2014 13:32:22 +0000 (15:32 +0200)

Trivial merge