Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Pablo Lezaeta 2012-07-20 23:28:40 -04:00
commit 6598d1bfae

View file

@ -19,7 +19,7 @@ Caramel
Mr. Carrot Cake
Mrs. Cup Cake
Cheerilee
Filthy Rich http://mlp.wikia.com/wiki/Filthy_Rich
Filthy Rich
Granny Smith
Hoity Toity
Mayor Mare