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

Trivial merge