[bugfix] Do not change user password if none was provided. Assumes that resetting a password to empty is never allowed once is has been set.
Merge pull request #116 from wolfgangmm/develop

Ignore null password for user account
update template
Fix collection.xconf schema to support new range index configuration.
renaming
Remove some redundancy from collection.xconf schema.
replace synchronization blocks by ReentrantReadWriteLock
cleanup
Merge branch 'feature/redesign' into develop
Merge pull request #117 from wolfgangmm/develop

Fix collection.xconf schema to support new range index configuration.
[testsuite] Copy namespaces occurring in test result before evaluating %test:assertXPath annotation. Saves some time when writing tests.
Merge pull request #119 from wolfgangmm/develop

XQuery tests: namespaces fix
[refactor] Imporved deprecation status of various deprecated functions
Merge pull request #121 from adamretter/develop

[refactor] Improved deprecation status of various deprecated functions
[feature] enable SSL support for xdb ant tasks
Merge pull request #123 from joewiz/develop

[feature] enable SSL support for xdb ant tasks

Excellent! Thanks Joe.
I am impressed to see your first Java contribution :-)
Merge pull request #118 from shabanovd/develop

I reviewed and tested Dmitriy's proposed changes locally and could not find any unexpected side effects. Concurrency issues are hard to test, so a small risk remains. The previous synchronized effectively locked the entire db though.
add unique part to transaction log folder to avoid conflicts between
transaction operations
Merge branch 'develop' into RC9