Merge branch 'kyoto'

Conflicts:
	common/storage.h
	common/storage_lmdb.cpp
	dummyresource/facade.cpp
	store/test/CMakeLists.txt
	tests/storagebenchmark.cpp

1 files changed, 3 insertions, 3 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 392ca39..e8b6f23 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,10 +47,10 @@ add_subdirectory(client)
 # the resource
 add_subdirectory(resource)
 
-# the store
-add_subdirectory(store)
-
 # a simple dummy resource implementation
 add_subdirectory(dummyresource)
 
+# some tests
+add_subdirectory(tests)
+
 feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)