..
Merge branch 'master' of https://github.com/crabyh/MiniSQL

Conflicts:
	MiniSQL/RecordManager.cpp