Aliases for Miguel Fernández
Merge remote-tracking branch 'mafia/master'

Conflicts:
	httpd.conf