]> git.mxchange.org Git - friendica.git/commitdiff
Merge remote-tracking branch 'upstream/develop' into 1511-vier-mobile2
authorMichael Vogel <icarus@dabo.de>
Tue, 3 Nov 2015 22:56:57 +0000 (23:56 +0100)
committerMichael Vogel <icarus@dabo.de>
Tue, 3 Nov 2015 22:56:57 +0000 (23:56 +0100)

Trivial merge