Applying stash 0
Merge branch 'cleanup' of github.com:benargo/atwd into cleanup

Conflicts:
	.htaccess
	test/index.php
Applying stash
Fixed stashed changes
Fixing stash 0 again
Applying next stash
Amending .htaccess
Applying stash 0
Merge branch 'cleanup' of github.com:benargo/atwd into cleanup

Conflicts:
	test/ajax_test.php
	test/index.php
Applying next stash
Applying next stash
Final cleanup