tweeks
dos -> unix
Merge branch 'master' into foo

Conflicts:
	phpQRCode/qrconfig.php
	phpQRCode/qrencode.php
	phpQRCode/qrmask.php
	phpQRCode/qrspec.php
	phpQRCode/qrtools.php
Merge pull request #3 from ravenbyron/foo

Foo