A
A0.1121
Merge branch 'master' of https://github.com/MaartenTe/Vicoin

Conflicts:
	.gitignore
	application/logs/log-2014-05-11.php