Merge

edit

This, and kalimotxo, and calimocho, should be merged. I'm not sure whether kalimotxo or calimocho is the better title, since neither is common in English. Kalimotxo is probably earlier, calimocho more common. -- Jmabel | Talk 23:24, Dec 15, 2004 (UTC)