commit
Merge branch 'master' of https://github.com/DHXD/logger

Conflicts:
	www/sites/domua.khituongthuyvan.net/modules/datalogger/datalogger.admin.inc
Merge branch 'master' of https://github.com/DHXD/logger

Conflicts:
	www/sites/domua.khituongthuyvan.net/modules/datalogger/datalogger.admin.inc
Quyet.
Merge branch 'master' of https://github.com/DHXD/logger

Conflicts:
	www/sites/domua.khituongthuyvan.net/modules/datalogger/datalogger.admin.inc
---Tu
Merge branch 'master' of https://github.com/DHXD/logger

Conflicts:
	www/sites/domua.khituongthuyvan.net/modules/datalogger/datalogger.admin.control-datalogger.inc
	www/sites/domua.khituongthuyvan.net/modules/datalogger/datalogger.admin.inc
	www/sites/domua.khituongthuyvan.net/modules/datalogger/datalogger.pages.vietbando.inc
Merge branch 'master' of https://github.com/DHXD/logger
Merge branch 'master' of https://github.com/DHXD/logger
Merge branch 'master' of https://github.com/DHXD/logger
----
Merge branch 'master' of https://github.com/DHXD/logger
----
Merge branch 'master' of https://github.com/DHXD/logger

Conflicts:
	www/sites/domua.khituongthuyvan.net/modules/datalogger/datalogger.pages.vietbando.inc
dfgdfg
Merge branch 'master' of https://github.com/DHXD/logger
Merge branch 'master' of https://github.com/DHXD/logger

Conflicts:
	www/sites/domua.khituongthuyvan.net/modules/datalogger/datalogger.pages.vietbando.inc
dfdf
Merge branch 'master' of https://github.com/DHXD/logger
Merge branch 'master' of https://github.com/DHXD/logger