]> git.mxchange.org Git - friendica.git/commitdiff
Merge remote-tracking branch 'upstream/develop' into 1501-api-speedup
authorMichael Vogel <icarus@dabo.de>
Sun, 1 Feb 2015 12:33:26 +0000 (13:33 +0100)
committerMichael Vogel <icarus@dabo.de>
Sun, 1 Feb 2015 12:33:26 +0000 (13:33 +0100)

Trivial merge