modified:   README.txt
	modified:   db/db_mysql.class.php
	modified:   core/misc.class.php
	modified:   auto.php
Merge branch 'master' of github.com:xiuno/xiunophp

Conflicts:
	README.txt
	core/misc.class.php

	modified:   ../README.txt
	modified:   ../auto.php
	modified:   core.class.php
	modified:   misc.class.php
	modified:   ../db/db_mysql.class.php