Aliases for Miguel Fernández
Update httpd.conf

JArranz redirect.
Merge pull request #7 from jgarranz/patch-1

Update httpd.conf
Update httpd.conf
Merge pull request #8 from tomasperezv/master

Update httpd.conf
Update httpd.conf
Merge pull request #9 from albgra/patch-1

Update httpd.conf
Update httpd.conf
Update httpd.conf
Merge pull request #10 from teseo/patch-1

Update httpd.conf
Merge remote-tracking branch 'mafia/master'

Conflicts:
	httpd.conf
Add rosa ^-^
ctallon host
Merge pull request #13 from carlostallon/patch-1

ctallon host
+felipe +fribeiro and sorted alphabetically