[master] Merge branch 'trac1332' with fixing conflicts.
Conflicts: ChangeLog src/lib/datasrc/sqlite3_accessor.h src/lib/datasrc/tests/database_unittest.cc
This diff is collapsed.
Please register or sign in to comment
Conflicts: ChangeLog src/lib/datasrc/sqlite3_accessor.h src/lib/datasrc/tests/database_unittest.cc