]> git.mxchange.org Git - friendica.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Sun, 20 Oct 2013 11:01:24 +0000 (13:01 +0200)
committerMichael Vogel <icarus@dabo.de>
Sun, 20 Oct 2013 11:01:24 +0000 (13:01 +0200)

Trivial merge