]> git.mxchange.org Git - friendica.git/commitdiff
Merge pull request #1 from friendica/develop
authorAndrej Stieben <e-mail@stieben.de>
Mon, 8 Feb 2016 21:23:01 +0000 (22:23 +0100)
committerAndrej Stieben <e-mail@stieben.de>
Mon, 8 Feb 2016 21:23:01 +0000 (22:23 +0100)
Merge upstream/develop


Trivial merge