еу
Merge branch 'master' of https://github.com/abaddonGIT/miniUpload

Conflicts:
	upload.php
alfa 0.0.1