Python: Fixed rebase conflicts.
Monitor: Added ability to extend monitor statistics via custom statistics providers.
Merge branch 'master' of github.com:reverbrain/elliptics
Python: Fixed copy-paste in session.py docstrings.
Merge pull request #327 from shaitan/master

Applied changes from lts branch.
doc: Added documentation generation by doxygen

It can be run by 'make doc', result is put into ${build}/doc directory
Merge pull request #328 from euroelessar/master

doc: Added documentation generation by doxygen
rpm: added make test
Merge pull request #329 from euroelessar/master

rpm: added make test
Monitor: Added REST-like api for getting monitor statistics.
Python: fixed None usage as Id in session.exec_()

Check must directly compare PyObject* to Py_None singleton, because other method
(checking object equality to python::api::object()) involves user defined
comparing/equality operators.
This is the case with elliptics.Id which has __cmp__ method, which
cannot accept None as an argument.
Merge pull request #332 from shaitan/monitor

Monitor: Added REST-like api for getting monitor statistics.
Merge pull request #334 from ijon/fix-python-none-as-exec-id

Python: fixed None usage as Id in session.exec_()
Python: fixed writting out of memory.
Merge pull request #335 from shaitan/monitor

Python: fixed writting out of memory.
trans: randomize route table update: select 5 random groups and read table from one random node from each selected group
monitor: fixed monitor header ifdef decoration
Cache: timestats refactored
Merge branch 'master' of https://github.com/reverbrain/elliptics into io_stats

Conflicts:
	cache/cache.cpp
	monitor/statistics.cpp

Cache: merge with master