]> git.mxchange.org Git - friendica.git/commitdiff
Merge remote-tracking branch 'upstream/develop' into 1508-random-becomes-guid
authorMichael Vogel <icarus@dabo.de>
Fri, 14 Aug 2015 05:19:11 +0000 (07:19 +0200)
committerMichael Vogel <icarus@dabo.de>
Fri, 14 Aug 2015 05:19:11 +0000 (07:19 +0200)

Trivial merge