Don't advertise auth mechanisms too early

If "starttls_required: true" is specified for c2s connections,
authentication mechanisms shouldn't be offered before negotiating the
TLS connection.
Merge pull request #325 from weiss/auth-after-tls

Don't advertise authentication mechanisms too early
Get rid of a hyphen in VSN
Return an empty <vCard/> element in an IQ-result when no vCard exists.

According to XEP-0054, if no vCard exists, the server MUST return a stanza
error (which SHOULD be <item-not-found/>) or an IQ-result containing an
empty <vCard/> element.

Signed-off-by: Gu Feng <flygoast@126.com>
Accept trailing whitespace in Base64 strings
Merge pull request #330 from weiss/accept-newline

Accept trailing newline characters in Base64 strings
Revert "fix mod_offline to store only chat messages with body xml element"

This reverts commit 436f0832c1d7cdd98c6629977d41700e5aa7e589.
Merge branch 'master' of github.com:processone/ejabberd
Add new option: store_empty_body
Merge pull request #328 from flygoast/master

Return an empty <vCard/> element in an IQ-result when no vCard exists.
Add xref Makefile target.

Conflicts:
	rebar.config.script
Ignore riak_object module call for xref check.

It's used in map-reduce function called from riak vm.
Fix xref check when odbc driver is not used.
fix invalid path of jiffy.so on install #309
Clean up rebar script.
Merge branch 'master' of github.com:processone/ejabberd
don't stop on error if jiffy.so symlink exists #309
Merge branch 'master' of github.com:processone/ejabberd
Add tests for mod_vcard_xupdate
Fix race in CSI test case