Updated lock/ack comments
Merge branch 'master' of github.com:reverbrain/elliptics
Merge pull request #103 from SaveTheRbtz/master

Performance, recovery and extended header fixes.
Fixed get_address_ranges.
Merge branch 'master' of github.com:reverbrain/elliptics
Fixed usage of session's wait timeout
Merge pull request #104 from euroelessar/master

Fixed usage of session's wait timeout
Merge branch 'master' of github.com:reverbrain/elliptics
Revert "v2.25.1.0"

This reverts commit 3f67f5fcd894a13cc187ec73792649af8977bf24.
v2.24.6.0
Merge remote-tracking branch 'upstream/master'
Removed useless variable.
Return -ENOMEM when calloc() fails in dnet_send_file_info_ts()
Get rid of number of oplocks config variables. Oplocks had been moved to tree, so this config parameter became just a hint about how many locks to preallocate.
Made dnet_parse_numeric_id() accessible to others
Drop dnet_parse_numeric_id() forward declaration
Use const string(char pointer) in dnet_parse_numeric_id()
Include cleanups
Use const char * instead of char *
session::update_indexes() debug print