]> git.mxchange.org Git - friendica.git/commitdiff
Merge branch 'master'
authorgerhard6380 <gerhard@seeber.at>
Thu, 22 Sep 2016 19:59:51 +0000 (21:59 +0200)
committergerhard6380 <gerhard@seeber.at>
Thu, 22 Sep 2016 19:59:51 +0000 (21:59 +0200)

Trivial merge