Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of github.com:dotoole/profanity
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of github.com:dotoole/profanity
Merge remote-tracking branch 'upstream/master'
initial support of autojoin for MUC
Merge remote-tracking branch 'dmitry/bookmarks' into nextdev
Merge branch 'master' into nextdev
Merge branch 'master' into nextdev
Merge branch 'master' into nextdev
Merge branch 'master' into nextdev
use get_unique_id for bookmarks
Merge branch 'master' into bookmarks
improved autojoin logic

Delete id handler after timeout (5sec) if response isn't received
Auto join maximum 5 conferences
draft of bookmarks implementation

'/bookmark add' and '/bookmark remove' ain't finished
Merge remote-tracking branch 'dmitry/bookmarks' into nextdev
Bookmarks: Move stanza pointer on in loop, check for autojoin "true"
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into nextdev
Merge branch 'master' into nextdev