Starting theme "Darkmanga"
Starting theme "Darkmanga"
Merge branch 'master' of github.com:adieush/lamanga

Conflicts:
	sites/all/modules/custom/lamanga_login/lamanga_login.info
	sites/all/modules/custom/lamanga_login/lamanga_login.module
	sites/all/themes/marinelli/css/primary-links.css
	sites/all/themes/marinelli/logo.png
	sites/all/themes/marinelli/marinelli.info
	sites/all/themes/marinelli/templates/page.tpl.php