* remotes/upstream/master:
send browser back to correct page (with query args) after posting
slight improvement in a couple of queries
Diabook-dark - do things the right way instead of the stupid way.
Fix TinyMCE, but needs adding to theme.php
Fix jquery.fancybox, but still needs adding to theme.php
Diabook-dark cleaned up a bit.
don't provide 'show more' on remote friends in common unless there are actually more
make it optional to optimize the item table after expire
wrap private message autocomplete in an ifdef to make it easier to test/develop
DE update for the strings
make mod-follow hookable (e.g. service class limits) and also begin to prepare it for functionalisation
projects / friendica.git / commit