]> git.mxchange.org Git - friendica.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Thu, 7 Mar 2013 19:20:12 +0000 (20:20 +0100)
committerMichael Vogel <icarus@dabo.de>
Thu, 7 Mar 2013 19:20:12 +0000 (20:20 +0100)

Trivial merge