]> git.mxchange.org Git - friendica.git/commitdiff
Merge remote-tracking branch 'upstream/develop' into 1601-network-performance
authorMichael Vogel <icarus@dabo.de>
Fri, 15 Jan 2016 07:33:21 +0000 (08:33 +0100)
committerMichael Vogel <icarus@dabo.de>
Fri, 15 Jan 2016 07:33:21 +0000 (08:33 +0100)

Trivial merge