]> git.mxchange.org Git - friendica.git/commitdiff
Merge remote branch 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Fri, 19 Oct 2012 05:12:15 +0000 (07:12 +0200)
committerMichael Vogel <icarus@dabo.de>
Fri, 19 Oct 2012 05:12:15 +0000 (07:12 +0200)

Trivial merge