Fix bug with password storage, where some characters would lead to
passwords not being remembered correctly.  This was because the UTF-8
character map is used for encryption, but the platform default is used for
decryption (which is ANSI for Windows 7).  UTF-8 is now used both ways.
Use config to control whether user can change presence state from the systray.
No change to default behaviour (i.e. user can change presence state).
Update JVM crash file location for OSX 10.6-10.8
and
Fix error with log collector filename filter
Say that contact details match if one is null and the other is empty,
rather than only if both null or both empty.
Add new config option to disable merging contacts, which removse 'Add
contact' from the contact right button menu.

Existing config options for 'move contact' and drag-and-drop of contacts
must also be used to completely prevent merging.
Make sure accounts have at least one attempt to login AFTER the reconnect
plugin has started listening for RegistrationEvents (so it can be notified
of failures)
Implement a new cache handling for ZRTP

The new ZRTP cache handling implements two main topics.

The first modification reduces the number of write requests to the external
storage and simplifies overall handling of a ZRTP cache entry in the stack.

The second modification implements a new handling of the RS2 data. This will
be a topic in an upcoming revised ZRTP specification.
Merge branch 'newCache'
Merge branch 'password' of \\\PC4315\work\github_jitsi\
Merge branch 'systray_presence_config' of \\\PC4315\work\github_jitsi\
Merge branch 'jvm_diags' of \\\PC4315\work\github_jitsi\
Merge branch 'contact_matching' of \\\PC4315\work\github_jitsi\
Merge branch 'merge_config' of \\\PC4315\work\github_jitsi\
Merge branch 'xmpp_connection' of \\\PC4315\work\github_jitsi\
Fixes multiple issues related to unplugging the last audio device and then plugging it back.
Reverts mistakenly committed lib/logging.properties.
Merge branch 'master' of git://github.com/jitsi/jitsi