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

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

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

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

Conflicts:
	www/sites/domua.khituongthuyvan.net/modules/datalogger/datalogger.admin.excel.month.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

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

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

Conflicts:
	www/.htaccess
	www/sites/domua.khituongthuyvan.net/modules/datalogger/datalogger.admin.inc
trung