More FAQ
Merge branch 'master' of https://github.com/friendica/red
Autocomplete smilies
Access list of smilies over JSON
protect_tag_hijacking (incorrect) -> prevent_tag_hijacking in docs (correct)
Doco - fix some tags.
Oopsie in German
Merge pull request #747 from pafcu/autocomplete

Better contact autocomplete based on jquery-textcomplete
Merge pull request #748 from pafcu/smilyjson

Access list of smilies over JSON
Merge pull request #749 from pafcu/hijackingdocfix

protect_tag_hijacking (incorrect) -> prevent_tag_hijacking in docs (corr...
rev update
Merge https://github.com/friendica/red into pending_merge
Merge remote-tracking branch 'upstream/master' into autocomplete