]> git.mxchange.org Git - friendica.git/commitdiff
Merge develop into allfriends
authorrabuzarus <trebor@central-unit>
Mon, 2 Nov 2015 13:31:20 +0000 (14:31 +0100)
committerrabuzarus <trebor@central-unit>
Mon, 2 Nov 2015 13:31:20 +0000 (14:31 +0100)

Trivial merge