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
Add xref test to travis.

Conflicts:
	.travis.yml
Avoid duplicates of carbon copies

When multiple resources have the same (highest) priority, the session
manager routes messages sent to their bare JID to each of these
resources.  When another resource has a lower priority but receives
carbon copies, make sure it won't receive multiple copies of such
messages.
Merge pull request #335 from weiss/avoid-carbon-dups

Avoid duplicates of carbon copies
Fix "make install" without JSON support

Don't bail out during "make install" when ./configure was called without
"--enable-json".