]> git.mxchange.org Git - friendica.git/commitdiff
Merge remote-tracking branch 'upstream/develop' into 1502-like-no-update-commented
authorMichael Vogel <icarus@dabo.de>
Mon, 23 Feb 2015 11:35:22 +0000 (12:35 +0100)
committerMichael Vogel <icarus@dabo.de>
Mon, 23 Feb 2015 11:35:22 +0000 (12:35 +0100)

Trivial merge