]> git.mxchange.org Git - friendica.git/commitdiff
Merge remote-tracking branch 'upstream/develop' into 1501-too-large-file-in-redirection
authorMichael Vogel <icarus@dabo.de>
Sun, 4 Jan 2015 18:51:25 +0000 (19:51 +0100)
committerMichael Vogel <icarus@dabo.de>
Sun, 4 Jan 2015 18:51:25 +0000 (19:51 +0100)

Trivial merge