Merge branch 'master' into trac2092_2
Conflicts: src/lib/datasrc/rbtree.h Also fixes some other API and data differences between master and trac2092_2 branch which caused several compile and test failures.
This diff is collapsed.
This diff is collapsed.
... | ... | @@ -125,10 +125,6 @@ |