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

Conflicts:
	www/.htaccess
quyet
quyet 26-4-2014