gittip/www.gittip.com — pull request #1461 by whit537 (2013-09-15 02:06:39+00:00)
Title: Fix merge again

This picks up where #1433 left off.