White vinegar plus a lemon cut in half. Spray the edges with vinegar, let it set for a few minutes, and then take the lemon and just scrub it on the tank.
Seriously. Lemons. I use them to clean the water marks off my faucets, sinks, and tubs. It works great on glass and I'm 99.9% sure it's nontoxic.
