Uriel7/Madereria — pull request #2 by rbarrera87 (2013-12-01 02:14:19+00:00)
Title: cambio en el combo I just screwed that up

Do the merge