Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of github.com:dbeck/virtdb-apps
Merge remote-tracking branch 'upstream/master'
half-baked implementation of test-data provider
Merge branch 'master' of github.com:dbeck/virtdb-apps
updating submodule